Merge pull request #28 from essamjoubori/master

Write some tests for the controller and router and added a controller folder
finish separation of concerns