Updated the folders architecture