Many changes, have not worked on this in a while.

1. Changed the package to updated domain.
2. Removed some unnecessary classes.
3. A few other minor changes.