Restructured directories
Merge branch 'master' of https://github.com/perroned/mywork