fixing circular dependency issue that was causing unpredicable import issues.