Bump version, class organization