Fixes a boatload of namespaces to make apps more testable
Merge branch 'origin/master'