Fixed the folders structure.