Moved demo services
Namespace controllers
Completed namespacing controllers
Namespace services
Fix paths