Refactoring - Namespace renaming
Merge branch 'master' of https://github.com/hristofornikolov/TeamSupremeProject