Reorganizing package creation stuff