Fix harcoded version.
Small code cleanup.
Rename package.
New version.