Move Diffable into correct package