Reorganized folders structure