Fixed the folder structure