* reorganize codebase
Merge branch 'master' of https://github.com/nuntiux/test-pi