refactoring
refactoring
More refactoring for the new structure
More refactoring
Finished reformatting namespaces I believe