Reorganizes routes and file structure