Reorganize.
Bump version.