moved package, improved namespaces