First Commit

Adding the basic service controller and folder structure
Merge remote-tracking branch 'upstream/master'