Cleaned up file structure, refactored routes