diff --git a/source/modules/src/data/sql/database-modules/build_grid/build.sql b/source/modules/src/data/sql/database-modules/build_grid/build.sql
index 10731fa..e75e74e 100644
--- a/source/modules/src/data/sql/database-modules/build_grid/build.sql
+++ b/source/modules/src/data/sql/database-modules/build_grid/build.sql
@@ -1,5 +1,5 @@
 SELECT system.raise_notice('Build: geometry_of_interests @ ' || timeofday());
-BEGIN; SELECT grid.ae_build_geometry_of_interests(); COMMIT;
+BEGIN; SELECT ae_build_geometry_of_interests(); COMMIT;
 
 SELECT system.raise_notice('Build: hexagons and receptors @ ' || timeofday());
-BEGIN; SELECT grid.ae_build_hexagons_and_receptors(); COMMIT;
+BEGIN; SELECT ae_build_hexagons_and_receptors(); COMMIT;
diff --git a/source/modules/src/data/sql/database-modules/build_grid_receptors_to/build-single-zoom-level.sql b/source/modules/src/data/sql/database-modules/build_grid_receptors_to/build-single-zoom-level.sql
deleted file mode 100644
index 8c0533a..0000000
--- a/source/modules/src/data/sql/database-modules/build_grid_receptors_to/build-single-zoom-level.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-SELECT system.raise_notice('Build: receptors_to_assessment_areas @ ' || timeofday());
-
-{multithread on: SELECT assessment_area_id FROM nature.assessment_areas ORDER BY assessment_area_id}
-
-	-- For the executed multi thread code execution the import_common_into_schema search path schema is not set.
-	-- This is the only way I could find to make this code work.
-	SET search_path TO 'grid', 'public';
-
-	INSERT INTO receptors_to_assessment_areas (receptor_id, assessment_area_id, surface)
-	SELECT
-		receptor_id,
-		assessment_area_id,
-		surface
-
-		FROM build_receptors_to_assessment_areas_view
-		
-		WHERE assessment_area_id = {assessment_area_id}
-	;
-
-{/multithread}
-
-
-SELECT system.raise_notice('Build: receptors_to_critical_deposition_areas @ ' || timeofday());
-
-{multithread on: SELECT assessment_area_id, critical_deposition_area_type FROM nature.assessment_areas CROSS JOIN (SELECT unnest(enum_range(null::public.critical_deposition_area_type)) AS critical_deposition_area_type) AS types ORDER BY assessment_area_id, critical_deposition_area_type }
-
-	-- For the executed multi thread code execution the import_common_into_schema search path schema is not set.
-	-- This is the only way I could find to make this code work.
-	SET search_path TO 'grid', 'public';
-
-	INSERT INTO receptors_to_critical_deposition_areas (assessment_area_id, type, critical_deposition_area_id, receptor_id, surface, receptor_habitat_coverage)
-	SELECT
-		assessment_area_id,
-		type,
-		critical_deposition_area_id,
-		receptor_id,
-		surface,
-		receptor_habitat_coverage
-
-		FROM build_receptors_to_critical_deposition_areas_view
-
-		WHERE
-			assessment_area_id = {assessment_area_id}
-			AND type = '{critical_deposition_area_type}'
-	;
-
-{/multithread}
diff --git a/source/modules/src/data/sql/database-modules/build_grid_receptors_to/store-as-single-zoom-level.sql b/source/modules/src/data/sql/database-modules/build_grid_receptors_to/store-as-single-zoom-level.sql
new file mode 100644
index 0000000..481c9a1
--- /dev/null
+++ b/source/modules/src/data/sql/database-modules/build_grid_receptors_to/store-as-single-zoom-level.sql
@@ -0,0 +1,42 @@
+-- 
+-- Store Multi-zoom-level- as Single-zoom-level structure by exporting the data without the zoom-level field.
+--
+SELECT system.store_query(
+	'grid.receptors_to_assessment_areas',
+	$$ SELECT
+		receptor_id,
+		assessment_area_id,
+		surface
+
+		FROM receptors_to_assessment_areas
+
+		ORDER BY
+			receptor_id,
+			assessment_area_id,
+			surface
+	$$,
+	'{data_folder}/export/{tablename}_{datesuffix}.txt'
+);
+
+SELECT system.store_query(
+	'grid.receptors_to_critical_deposition_areas',
+	$$ SELECT
+		assessment_area_id,
+		type,
+		critical_deposition_area_id,
+		receptor_id,
+		surface,
+		receptor_habitat_coverage
+
+		FROM receptors_to_critical_deposition_areas
+
+		ORDER BY
+			assessment_area_id,
+			type,
+			critical_deposition_area_id,
+			receptor_id,
+			surface,
+			receptor_habitat_coverage
+	$$,
+	'{data_folder}/export/{tablename}_{datesuffix}.txt'
+);