Changed the organization of Folders