Move to my fork of scallop.  Add current conditions.  Refactoring of class and
file names.