refactored controllers, changed nesting and routes