v2.0

Restructuring / renaming should go into release 2.0

No issues for this version