Remove inheritance patch classes
Make Patch a module since it only has singleton methods