move and rename things
doc correction