#115 - moved the controller test case to namespaces, and moved many more classes to namespaces to ensure that test case would pass