refactor express app to meet style & structure guides
Merge branch 'dev'