diff --git a/docs/blueprints/all/uml/all_domain_model_import.puml b/docs/blueprints/all/uml/all_domain_model_import.puml
index 5d930344c819d79331e196c47d86a28fbec15922..b5cc3e932db641f598a9158dd1f5bc9cf287106a 100644
--- a/docs/blueprints/all/uml/all_domain_model_import.puml
+++ b/docs/blueprints/all/uml/all_domain_model_import.puml
@@ -1,7 +1,7 @@
 @startuml
 left to right direction
 
-package covid19.blueprints.all {
+package covid19.blueprints.all.model_import {
 
 	interface AllImportFull {
 		{classifier} download_file()
@@ -59,62 +59,7 @@ package covid19.blueprints.all {
 
 }
 
-package covid19.blueprints.who {
-
-	entity WhoImport {
-	    id: Integer
-	    date_reported: String
-	    country_code: String
-	    country: String
-	    who_region: String
-	    new_cases: String
-	    cumulative_cases: String
-	    new_deaths: String
-	    cumulative_deaths: String
-		{classifier} download_file()
-		{classifier} import_file()
-		{classifier} full_update_dimension_tables()
-		{classifier} full_update_fact_table()
-		{classifier} full_update_star_schema()
-		{classifier} update_dimension_tables()
-		{classifier} update_fact_table()
-		{classifier} update_star_schema()
-	}
-
-	entity WhoFlat {
-	    id: Integer
-	    datum_reported: Date
-	    year: Integer
-	    month: Integer
-	    day_of_month: Integer
-		day_of_year: Integer
-	    day_of_week: Integer
-	    week_of_year: Integer
-	    year_week:  String
-	    day_of_week_str: String
-		month_str: String
-		location: String
-		location_group: String
-	    date_reported: String
-	    country_code: String
-	    country: String
-	    who_region: String
-	    new_cases: String
-	    cumulative_cases: String
-	    new_deaths: String
-	    cumulative_deaths: String
-		{classifier} import_file_flat()
-		{classifier} get_years(): Integer[]
-		{classifier} get_days(): Date[]
-		{classifier} get_days_for_year(year: Integer): Date[]
-		{classifier} get_location_groups(): String[]
-		{classifier} get_locations_for_location_group(location_group: String): String[]
-		{classifier} get_data_for_location(location: String): WhoFlat[]
-		{classifier} get_data_for_day(datum_reported: Date): WhoFlat[]
-	}
-}
-
-package covid19.blueprints.ecdc {
+package covid19.blueprints.ecdc.model_import {
 
 	entity EcdcImport {
 	    id: Integer
@@ -178,164 +123,7 @@ package covid19.blueprints.ecdc {
 
 }
 
-package covid19.blueprints.rki_vaccination {
-
-	entity RkiVaccinationImport {
-	    id: Integer
-	    dosen_kumulativ: Integer
-	    dosen_differenz_zum_vortag: Integer
-	    dosen_biontech_kumulativ: Integer
-	    dosen_moderna_kumulativ: Integer
-	    personen_erst_kumulativ: Integer
-	    personen_voll_kumulativ: Integer
-	    impf_quote_erst: Float
-	    impf_quote_voll: Float
-	    indikation_alter_dosen: Integer
-	    indikation_beruf_dosen: Integer
-	    indikation_medizinisch_dosen: Integer
-	    indikation_pflegeheim_dosen: Integer
-	    indikation_alter_erst: Integer
-	    indikation_beruf_erst: Integer
-	    indikation_medizinisch_erst: Integer
-	    indikation_pflegeheim_erst: Integer
-	    indikation_alter_voll: Integer
-	    indikation_beruf_voll: Integer
-	    indikation_medizinisch_voll: Integer
-	    indikation_pflegeheim_voll: Integer
-	    date_reported: String
-		{classifier} download_file()
-		{classifier} import_file()
-		{classifier} full_update_dimension_tables()
-		{classifier} full_update_fact_table()
-		{classifier} full_update_star_schema()
-		{classifier} update_dimension_tables()
-		{classifier} update_fact_table()
-		{classifier} update_star_schema()
-	}
-
-	entity RkiVaccinationFlat {
-	    id: Integer
-	    datum_reported: Date
-	    year: Integer
-	    month: Integer
-	    day_of_month: Integer
-		day_of_year: Integer
-	    day_of_week: Integer
-	    week_of_year: Integer
-	    year_week:  String
-	    day_of_week_str: String
-		month_str: String
-		location: String
-		location_group: String
-	    dosen_kumulativ: Integer
-	    dosen_differenz_zum_vortag: Integer
-	    dosen_biontech_kumulativ: Integer
-	    dosen_moderna_kumulativ: Integer
-	    personen_erst_kumulativ: Integer
-	    personen_voll_kumulativ: Integer
-	    impf_quote_erst: Float
-	    impf_quote_voll: Float
-	    indikation_alter_dosen: Integer
-	    indikation_beruf_dosen: Integer
-	    indikation_medizinisch_dosen: Integer
-	    indikation_pflegeheim_dosen: Integer
-	    indikation_alter_erst: Integer
-	    indikation_beruf_erst: Integer
-	    indikation_medizinisch_erst: Integer
-	    indikation_pflegeheim_erst: Integer
-	    indikation_alter_voll: Integer
-	    indikation_beruf_voll: Integer
-	    indikation_medizinisch_voll: Integer
-	    indikation_pflegeheim_voll: Integer
-	    date_reported: String
-		{classifier} import_file_flat()
-		{classifier} get_years(): Integer[]
-		{classifier} get_days(): Date[]
-		{classifier} get_days_for_year(year: Integer): Date[]
-		{classifier} get_location_groups(): String[]
-		{classifier} get_locations_for_location_group(location_group: String): String[]
-		{classifier} get_data_for_location(location: String): RkiVaccinationFlat[]
-		{classifier} get_data_for_day(datum_reported: Date): RkiVaccinationFlat[]
-	}
-
-}
-
-package covid19.blueprints.rki_cases {
-
-	entity RkiImport {
-		id: Integer
-	    fid: String
-	    id_bundesland: String
-	    bundesland: String
-	    landkreis: String
-	    altersgruppe: String
-	    geschlecht: String
-	    anzahl_fall: String
-	    anzahl_todesfall: String
-	    meldedatum: String
-	    id_landkreis: String
-	    datenstand: String
-	    neuer_fall: String
-	    neuer_todesfall: String
-	    ref_datum: String
-	    neu_genesen: String
-	    anzahl_genesen: String
-	    ist_erkrankungsbeginn: String
-	    altersgruppe2: String
-		{classifier} download_file()
-		{classifier} import_file()
-		{classifier} full_update_dimension_tables()
-		{classifier} full_update_fact_table()
-		{classifier} full_update_star_schema()
-		{classifier} update_dimension_tables()
-		{classifier} update_fact_table()
-		{classifier} update_star_schema()
-	}
-
-	entity RkiFlat {
-	    id: Integer
-	    datum_reported: Date
-	    year: Integer
-	    month: Integer
-	    day_of_month: Integer
-		day_of_year: Integer
-	    day_of_week: Integer
-	    week_of_year: Integer
-	    year_week:  String
-	    day_of_week_str: String
-		month_str: String
-		location: String
-		location_group: String
-	    fid: String
-	    id_bundesland: String
-	    bundesland: String
-	    landkreis: String
-	    altersgruppe: String
-	    geschlecht: String
-	    anzahl_fall: String
-	    anzahl_todesfall: String
-	    meldedatum: String
-	    id_landkreis: String
-	    datenstand: String
-	    neuer_fall: String
-	    neuer_todesfall: String
-	    ref_datum: String
-	    neu_genesen: String
-	    anzahl_genesen: String
-	    ist_erkrankungsbeginn: String
-	    altersgruppe2: String
-		{classifier} import_file_flat()
-		{classifier} get_years(): Integer[]
-		{classifier} get_days(): Date[]
-		{classifier} get_days_for_year(year: Integer): Date[]
-		{classifier} get_location_groups(): String[]
-		{classifier} get_locations_for_location_group(location_group: String): String[]
-		{classifier} get_data_for_location(location: String): RkiCasesFlat[]
-		{classifier} get_data_for_day(datum_reported: Date): RkiCasesFlat[]
-	}
-}
-
-package covid19.blueprints.owid {
+package covid19.blueprints.owid.model_import {
 
 	entity OwidImport {
 	    id: Integer
@@ -493,6 +281,220 @@ package covid19.blueprints.owid {
 
 }
 
+
+package covid19.blueprints.rki_cases.model_import {
+
+	entity RkiImport {
+		id: Integer
+	    fid: String
+	    id_bundesland: String
+	    bundesland: String
+	    landkreis: String
+	    altersgruppe: String
+	    geschlecht: String
+	    anzahl_fall: String
+	    anzahl_todesfall: String
+	    meldedatum: String
+	    id_landkreis: String
+	    datenstand: String
+	    neuer_fall: String
+	    neuer_todesfall: String
+	    ref_datum: String
+	    neu_genesen: String
+	    anzahl_genesen: String
+	    ist_erkrankungsbeginn: String
+	    altersgruppe2: String
+		{classifier} download_file()
+		{classifier} import_file()
+		{classifier} full_update_dimension_tables()
+		{classifier} full_update_fact_table()
+		{classifier} full_update_star_schema()
+		{classifier} update_dimension_tables()
+		{classifier} update_fact_table()
+		{classifier} update_star_schema()
+	}
+
+	entity RkiFlat {
+	    id: Integer
+	    datum_reported: Date
+	    year: Integer
+	    month: Integer
+	    day_of_month: Integer
+		day_of_year: Integer
+	    day_of_week: Integer
+	    week_of_year: Integer
+	    year_week:  String
+	    day_of_week_str: String
+		month_str: String
+		location: String
+		location_group: String
+	    fid: String
+	    id_bundesland: String
+	    bundesland: String
+	    landkreis: String
+	    altersgruppe: String
+	    geschlecht: String
+	    anzahl_fall: String
+	    anzahl_todesfall: String
+	    meldedatum: String
+	    id_landkreis: String
+	    datenstand: String
+	    neuer_fall: String
+	    neuer_todesfall: String
+	    ref_datum: String
+	    neu_genesen: String
+	    anzahl_genesen: String
+	    ist_erkrankungsbeginn: String
+	    altersgruppe2: String
+		{classifier} import_file_flat()
+		{classifier} get_years(): Integer[]
+		{classifier} get_days(): Date[]
+		{classifier} get_days_for_year(year: Integer): Date[]
+		{classifier} get_location_groups(): String[]
+		{classifier} get_locations_for_location_group(location_group: String): String[]
+		{classifier} get_data_for_location(location: String): RkiCasesFlat[]
+		{classifier} get_data_for_day(datum_reported: Date): RkiCasesFlat[]
+	}
+}
+
+package covid19.blueprints.rki_vaccination.model_import {
+
+	entity RkiVaccinationImport {
+	    id: Integer
+	    dosen_kumulativ: Integer
+	    dosen_differenz_zum_vortag: Integer
+	    dosen_biontech_kumulativ: Integer
+	    dosen_moderna_kumulativ: Integer
+	    personen_erst_kumulativ: Integer
+	    personen_voll_kumulativ: Integer
+	    impf_quote_erst: Float
+	    impf_quote_voll: Float
+	    indikation_alter_dosen: Integer
+	    indikation_beruf_dosen: Integer
+	    indikation_medizinisch_dosen: Integer
+	    indikation_pflegeheim_dosen: Integer
+	    indikation_alter_erst: Integer
+	    indikation_beruf_erst: Integer
+	    indikation_medizinisch_erst: Integer
+	    indikation_pflegeheim_erst: Integer
+	    indikation_alter_voll: Integer
+	    indikation_beruf_voll: Integer
+	    indikation_medizinisch_voll: Integer
+	    indikation_pflegeheim_voll: Integer
+	    date_reported: String
+		{classifier} download_file()
+		{classifier} import_file()
+		{classifier} full_update_dimension_tables()
+		{classifier} full_update_fact_table()
+		{classifier} full_update_star_schema()
+		{classifier} update_dimension_tables()
+		{classifier} update_fact_table()
+		{classifier} update_star_schema()
+	}
+
+	entity RkiVaccinationFlat {
+	    id: Integer
+	    datum_reported: Date
+	    year: Integer
+	    month: Integer
+	    day_of_month: Integer
+		day_of_year: Integer
+	    day_of_week: Integer
+	    week_of_year: Integer
+	    year_week:  String
+	    day_of_week_str: String
+		month_str: String
+		location: String
+		location_group: String
+	    dosen_kumulativ: Integer
+	    dosen_differenz_zum_vortag: Integer
+	    dosen_biontech_kumulativ: Integer
+	    dosen_moderna_kumulativ: Integer
+	    personen_erst_kumulativ: Integer
+	    personen_voll_kumulativ: Integer
+	    impf_quote_erst: Float
+	    impf_quote_voll: Float
+	    indikation_alter_dosen: Integer
+	    indikation_beruf_dosen: Integer
+	    indikation_medizinisch_dosen: Integer
+	    indikation_pflegeheim_dosen: Integer
+	    indikation_alter_erst: Integer
+	    indikation_beruf_erst: Integer
+	    indikation_medizinisch_erst: Integer
+	    indikation_pflegeheim_erst: Integer
+	    indikation_alter_voll: Integer
+	    indikation_beruf_voll: Integer
+	    indikation_medizinisch_voll: Integer
+	    indikation_pflegeheim_voll: Integer
+	    date_reported: String
+		{classifier} import_file_flat()
+		{classifier} get_years(): Integer[]
+		{classifier} get_days(): Date[]
+		{classifier} get_days_for_year(year: Integer): Date[]
+		{classifier} get_location_groups(): String[]
+		{classifier} get_locations_for_location_group(location_group: String): String[]
+		{classifier} get_data_for_location(location: String): RkiVaccinationFlat[]
+		{classifier} get_data_for_day(datum_reported: Date): RkiVaccinationFlat[]
+	}
+
+}
+
+package covid19.blueprints.who.model_import {
+
+	entity WhoImport {
+	    id: Integer
+	    date_reported: String
+	    country_code: String
+	    country: String
+	    who_region: String
+	    new_cases: String
+	    cumulative_cases: String
+	    new_deaths: String
+	    cumulative_deaths: String
+		{classifier} download_file()
+		{classifier} import_file()
+		{classifier} full_update_dimension_tables()
+		{classifier} full_update_fact_table()
+		{classifier} full_update_star_schema()
+		{classifier} update_dimension_tables()
+		{classifier} update_fact_table()
+		{classifier} update_star_schema()
+	}
+
+	entity WhoFlat {
+	    id: Integer
+	    datum_reported: Date
+	    year: Integer
+	    month: Integer
+	    day_of_month: Integer
+		day_of_year: Integer
+	    day_of_week: Integer
+	    week_of_year: Integer
+	    year_week:  String
+	    day_of_week_str: String
+		month_str: String
+		location: String
+		location_group: String
+	    date_reported: String
+	    country_code: String
+	    country: String
+	    who_region: String
+	    new_cases: String
+	    cumulative_cases: String
+	    new_deaths: String
+	    cumulative_deaths: String
+		{classifier} import_file_flat()
+		{classifier} get_years(): Integer[]
+		{classifier} get_days(): Date[]
+		{classifier} get_days_for_year(year: Integer): Date[]
+		{classifier} get_location_groups(): String[]
+		{classifier} get_locations_for_location_group(location_group: String): String[]
+		{classifier} get_data_for_location(location: String): WhoFlat[]
+		{classifier} get_data_for_day(datum_reported: Date): WhoFlat[]
+	}
+}
+
+
 AllImportFull <|-- DataImport
 AllImportIncrement <|-- DataImport
 DataImport <|-- AllFlat