CLN: Fix import collisions and optimize imports
this is too sweeping. you are changing things which may or may not be tested (e.g. docs / make scripts and such). on the main code base this is ok, so pls revise.
