Changed the structure of the folders