Reorganizing the layout of the package