Split stuff into new namespaces