Namespace change
Solution references
Refactoring files
Refactoring files
Updated headers