It's okay to move that too. I don't think we've avoided cyclic dependencies between packages at this point.