Fixed all the namespaces to match new folder structure
Just reorganized the folders. Namespacing broken, unit tests broken, nothing works.