change directory structure
fix import errors and bump version