Package/symbol/device consolidation, renaming, simplification, improvement, etc.
Merge pull request #2 from gshort/master

General upgrades