Many things before merge.

Renaming package + adding features.
merge
something