Move files, fix tests and change namespaces