Better packaging.
Cleanup code.