finish separation of concerns
Merge pull request #31 from essamjoubori/master

finish separation of concerns