Clean up some of the relative and circular imports