Refactored diff. calc to CDiff classes - only updated makefile.unix