Bug fixing; MetadataCatalog renamed to FileCatalog; FileCatalog dev