cleanup
rename
move
imports
fixing take ..