refactor using six
refactor package structure
version 1.1.2