More Refactoring

Corrected namespaces to reflect new projects layouts