Moved types to appropriate namespaces