fix package hierarchy