Changed the structure of folders