interim commit - additional work on FileDiff and FileEnum packages