Refactoring of datasets.  Fitness measures complete.
Fixed name of fitness measures script.