Cleaning up the namespaces for the project
Cleaning up the namesaces for the project