Fixed routing, rename content to controller
Merge pull request #49 from md-systems/routing_fixes

Fixed routing, rename content to controller