Fixed namespaces and files moved around