Move deprecated methods into the compatibility classes, out of the main library classes