fix the package hierarchy