fixed package hierarchy