Cleaned up namespaces
Merge branch 'master' of github.com:Riaka/Sandbox