Re-structure package hierarchy