We want to ensure that we give the resolve the address context so that it can filter whether or not the address range applies.
The lib/ directory was getting a bit out of hand, so this tries to organize things a bit so it is easier going forward to locate the code people want to patch.
