Adjusted project namespaces
Refactoring