Reorganization of directories
Merge branch 'master' of github.com:seagoj/devtools