Models & routes into own files
Merge branch 'master' into openshift