reorganize
add separate option
version bump 0.0.2