Changed the folder structures