Move imports around.

Fewer directories more modules.