Lots of Fixes and Additions

Added new items, fixed method names, and reorganized the packages.