PROPOSAL: More base package breakup