Refactoring into modules
Merge branch 'master' of https://github.com/carbonrobot/officeAvenger