Restructured modules
Updated version to 0.2.1
Fixed index bug