Refactored packaging and stuff.
Fix tests.