reorganize structure
doc fix