rearranged package namespaces