Still trying to consolidate package hierarchy