Trim and consolidate packages.
Further consolidation and reorganization.