reorganize
version, test
update docs