General upgrades

Package/symbol/device consolidation, renaming, simplification, improvement, etc.