Reorganized package hierarchy