More initial re-packaging changes (no code changes).