Removed some skeleton code and added basic Route Modules, started basic structure for module organisation.
Merge remote-tracking branch 'origin/master'