Move code to proper namespaces.