more modularization
Merge branch 'master' of https://github.com/ha1ogen/atlassed