Updated the folder structure