Use new naming convencion, added layout folder
Merge branch 'master' of github.com:enzolutions/marionette-skeleton-app