Refactor namespaces & directory structure

Namespaces and directory structure now line up. I think there could still be some changes to the namespaces, but it's fine for now.