first cut of refactored pkg names for fwk