Reorganize DEP and RPM packages