Restructuring to get a basic application layout sorted
Merge branch 'master' of github.com:eddarmitage/jaffa-cake