Re #1377 Create a format for the mapping files for the ingestion team to fill in

 * Code cleaning of Dataset API related classes