Revert "Unfinished - Updates to MVC separation; Changed configuration to...

... a properties file"

This reverts commit ccaedf692a59d8e2dd3dda94f6c4f9d728876e4e.