Added routing and controllers, updated models