reorg directories
Merge branch 'master' of https://github.com/hacksome/hacksome