Code rearrange and cleanup. v0.2 (update package info)