Reorganized package to be installable