Refactoring on router and controllers.
Merge pull request #6 from paulld/remove-hashtag

Refactoring on router and controllers.