Clean up - Separated out routes and basic config