Refactoring...seperating server and client controllers/routes