Move code into different namespaces.