Initial import
First version that does something (more-or-less)
Merge remote-tracking branch 'origin/master'
Reorganise directory structure