Refactored routes to controllers, prepare for import removal and adding survey code