cleanup
doc: restructure