Fix directory structure
Merge branch 'master' of github.com:dannysheehan/ubuntu