Reorganize code
Bump version#