Fixed the folder structure issues