Separated routes from controllers

Revert back to having routes  separate from the controllers