package structure cleanup
dump rewrite package