Reorganize code.
Bump up version.