Large scale Clean-up of IRI and File path creation.  Other clean-up of tests.