Reorganize predefined things into namespaces.