Put code in proper namespaces