Re-added HashableRect class and moved UML diags.