more reshuffling - preparing for package creation