add new folder structure to Msuhra tests