Add namespacing for controllers
fixed stuff
Merge branch 'mruoss-master'