* Updated dependencies
* Reorganized some things.
* Some cleanup
* Bump version