reorganized folders in the project