significant refactoring; cadf now in scf subdirectory.  Compilation times much faster