Fixes with diff operations. Combine Tree and Util modules. Use standard Data.Tree module.