Making an MVC Structure, minor changes
Merge origin/master