simplify and make final
reorganize
bump version to 0.7