Routing

Moved controllers into routing & corrected path of templates