Fixes circular import errors.

Moves a few imports back to where they were.