Improve Namespaces
Merge branch 'master' of https://github.com/ycodeteam/Rubor.git