cleaner directory structure
Merge branch 'master' of github.com:athery/pirover