Changed the folder structure