clean up directory layout
bump version