changed the folders structure