Get everything configured properly to run as a modular application.
Merge branch 'mvc-refactor'

Merging with branch mvc-refactor