Moving rectangle-centric methods to their own package