organised the file structure/packages appropriately for MVC
Merge remote-tracking branch 'origin/master'