Changed the folder structure.