Adjusted package setup and fixed a few classes.
Merge pull request #144 from Jedwondle/master

Adjusted package setup and fixed a few classes.