Reorganized package