Prepare moving diff/apply to own class. See #23