Completely changed the folders structure