This follows a similar approach to the previous commits, noting that one module depends on the other, so we have to extract both together.
Ben Thorner