Cleaned up routes, made controllers, bound the two together