add non-qualified entries
mv package index to top level