move some tasks to sub-namespaces