Remove circular dependencies in the imports