Began reorganizing namespaces