Revamped Controllers and Routing (cleanup)