reorganize, work on docs, other cleanup