Reorganizes folder system in project