diff --git a/apps/cb-metar/private/sqlTemplates b/apps/cb-metar/private/sqlTemplates
deleted file mode 120000
index c68e4fd55a..0000000000
--- a/apps/cb-metar/private/sqlTemplates
+++ /dev/null
@@ -1 +0,0 @@
-../server/dataFunctions/sqlTemplates/
\ No newline at end of file
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/DailyModelCycle_region_test.sql b/apps/cb-metar/private/sqlTemplates/test/DailyModelCycle_region_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/DailyModelCycle_region_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/DailyModelCycle_region_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/DailyModelCycle_stations_test.sql b/apps/cb-metar/private/sqlTemplates/test/DailyModelCycle_stations_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/DailyModelCycle_stations_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/DailyModelCycle_stations_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/DieOff_region_DieOff_SingleCycle_test.sql b/apps/cb-metar/private/sqlTemplates/test/DieOff_region_DieOff_SingleCycle_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/DieOff_region_DieOff_SingleCycle_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/DieOff_region_DieOff_SingleCycle_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/DieOff_region_DieOff_UTC_test.sql b/apps/cb-metar/private/sqlTemplates/test/DieOff_region_DieOff_UTC_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/DieOff_region_DieOff_UTC_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/DieOff_region_DieOff_UTC_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/DieOff_region_DieOff_test.sql b/apps/cb-metar/private/sqlTemplates/test/DieOff_region_DieOff_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/DieOff_region_DieOff_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/DieOff_region_DieOff_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/DieOff_stations_test.sql b/apps/cb-metar/private/sqlTemplates/test/DieOff_stations_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/DieOff_stations_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/DieOff_stations_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/Map_test.sql b/apps/cb-metar/private/sqlTemplates/test/Map_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/Map_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/Map_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/Threshold_test.sql b/apps/cb-metar/private/sqlTemplates/test/Threshold_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/Threshold_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/Threshold_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/TimeSeries_stations_test.sql b/apps/cb-metar/private/sqlTemplates/test/TimeSeries_stations_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/TimeSeries_stations_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/TimeSeries_stations_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/ValidTime_region_test.sql b/apps/cb-metar/private/sqlTemplates/test/ValidTime_region_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/ValidTime_region_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/ValidTime_region_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/test/ValidTime_stations_test.sql b/apps/cb-metar/private/sqlTemplates/test/ValidTime_stations_test.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/test/ValidTime_stations_test.sql
rename to apps/cb-metar/private/sqlTemplates/test/ValidTime_stations_test.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_Contour.sql b/apps/cb-metar/private/sqlTemplates/tmpl_Contour.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_Contour.sql
rename to apps/cb-metar/private/sqlTemplates/tmpl_Contour.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DailyModelCycle.sql b/apps/cb-metar/private/sqlTemplates/tmpl_DailyModelCycle.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DailyModelCycle.sql
rename to apps/cb-metar/private/sqlTemplates/tmpl_DailyModelCycle.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff.sql b/apps/cb-metar/private/sqlTemplates/tmpl_DieOff.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff.sql
rename to apps/cb-metar/private/sqlTemplates/tmpl_DieOff.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff_SingleCycle.sql b/apps/cb-metar/private/sqlTemplates/tmpl_DieOff_SingleCycle.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff_SingleCycle.sql
rename to apps/cb-metar/private/sqlTemplates/tmpl_DieOff_SingleCycle.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff_UTC.sql b/apps/cb-metar/private/sqlTemplates/tmpl_DieOff_UTC.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_DieOff_UTC.sql
rename to apps/cb-metar/private/sqlTemplates/tmpl_DieOff_UTC.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_Histogram.sql b/apps/cb-metar/private/sqlTemplates/tmpl_Histogram.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_Histogram.sql
rename to apps/cb-metar/private/sqlTemplates/tmpl_Histogram.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_PerformanceDiagram.sql b/apps/cb-metar/private/sqlTemplates/tmpl_PerformanceDiagram.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_PerformanceDiagram.sql
rename to apps/cb-metar/private/sqlTemplates/tmpl_PerformanceDiagram.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_Threshold.sql b/apps/cb-metar/private/sqlTemplates/tmpl_Threshold.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_Threshold.sql
rename to apps/cb-metar/private/sqlTemplates/tmpl_Threshold.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_TimeSeries.sql b/apps/cb-metar/private/sqlTemplates/tmpl_TimeSeries.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_TimeSeries.sql
rename to apps/cb-metar/private/sqlTemplates/tmpl_TimeSeries.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_ValidTime.sql b/apps/cb-metar/private/sqlTemplates/tmpl_ValidTime.sql
similarity index 100%
rename from apps/cb-metar/server/dataFunctions/sqlTemplates/tmpl_ValidTime.sql
rename to apps/cb-metar/private/sqlTemplates/tmpl_ValidTime.sql
diff --git a/apps/cb-metar/server/dataFunctions/sqlTemplates b/apps/cb-metar/server/dataFunctions/sqlTemplates
new file mode 120000
index 0000000000..c839d49722
--- /dev/null
+++ b/apps/cb-metar/server/dataFunctions/sqlTemplates
@@ -0,0 +1 @@
+../../private/sqlTemplates
\ No newline at end of file
diff --git a/apps/scorecard/CBUtilities.test.js b/apps/scorecard/CBUtilities.test.js
deleted file mode 100644
index 8054ff03ae..0000000000
--- a/apps/scorecard/CBUtilities.test.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import { matsCouchbaseUtils } from "meteor/randyp:mats-common";
-
-test("tests read and write", () => {
-  const test = async () => {
-    const fs = require("fs");
-
-    homedir = process.env.HOME;
-    try {
-      const data = fs.readFileSync(`${homedir}/adb-cb4-credentials`, "utf8");
-      data.split(/\r?\n/).forEach((line) => {
-        parts = line.split(":");
-        credentials[parts[0]] = parts[1];
-      });
-
-      console.log(data);
-    } catch (err) {
-      console.error(err);
-    }
-    const host = credentials.cb_host;
-    const { password } = credentials;
-    // "adb-cb2.gsd.esrl.noaa.gov,adb-cb3.gsd.esrl.noaa.gov,adb-cb4.gsd.esrl.noaa.gov";
-    const bucketName = credentials.cb_bucket;
-    const collection = "SCORECARD"; // using scorecard bucket to test read and write capability
-    const { scope } = credentials;
-
-    cbUtilities = new matsCouchbaseUtils.CBUtilities(
-      host,
-      bucketName,
-      scope,
-      collection,
-      user,
-      pwd
-    );
-
-    const test_doc = {
-      type: "airline",
-      id: 8091,
-      callsign: "CBS",
-      iata: null,
-      icao: null,
-      name: "Couchbase Airways",
-    };
-    const key = `${test_doc.type}_${test_doc.id}`;
-    const statement = `select * from \`travel-sample\` where meta().id = '${key}';`;
-
-    try {
-      const time = await cbUtilities.queryCB("select NOW_MILLIS() as time;");
-      console.log("queryCB: ", time);
-    } catch (err) {
-      console.log(err);
-    }
-
-    try {
-      const ret = await cbUtilities.upsertCB(key, test_doc);
-      console.log("upsertCB: ", ret);
-    } catch (err) {
-      console.log(err);
-    }
-
-    try {
-      const ret1 = await cbUtilities.getCB(key);
-      console.log("getCB: ", ret1);
-    } catch (err) {
-      console.log(err);
-    }
-
-    try {
-      const ret2 = await cbUtilities.queryCB(statement);
-      console.log("queryCB: ", ret2);
-    } catch (err) {
-      console.log(err);
-    }
-
-    try {
-      const ret3 = await cbUtilities.removeCB(key);
-      console.log("deleteCB: ", ret3);
-    } catch (err) {
-      console.log(err);
-    }
-
-    await cbUtilities.closeConnection();
-    // process.exit();
-  };
-});
diff --git a/apps/scorecard/private/sqlTemplates b/apps/scorecard/private/sqlTemplates
deleted file mode 120000
index d017708b65..0000000000
--- a/apps/scorecard/private/sqlTemplates
+++ /dev/null
@@ -1 +0,0 @@
-../server/dataFunctions/sqlTemplates
\ No newline at end of file
diff --git a/apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_anomalycor_timeseries.sql b/apps/scorecard/private/sqlTemplates/tmpl_anomalycor_timeseries.sql
similarity index 100%
rename from apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_anomalycor_timeseries.sql
rename to apps/scorecard/private/sqlTemplates/tmpl_anomalycor_timeseries.sql
diff --git a/apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_ceil-vis_timeseries.sql b/apps/scorecard/private/sqlTemplates/tmpl_ceil-vis_timeseries.sql
similarity index 100%
rename from apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_ceil-vis_timeseries.sql
rename to apps/scorecard/private/sqlTemplates/tmpl_ceil-vis_timeseries.sql
diff --git a/apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_landuse_timeseries.sql b/apps/scorecard/private/sqlTemplates/tmpl_landuse_timeseries.sql
similarity index 100%
rename from apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_landuse_timeseries.sql
rename to apps/scorecard/private/sqlTemplates/tmpl_landuse_timeseries.sql
diff --git a/apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_precipAccum_timeseries.sql b/apps/scorecard/private/sqlTemplates/tmpl_precipAccum_timeseries.sql
similarity index 100%
rename from apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_precipAccum_timeseries.sql
rename to apps/scorecard/private/sqlTemplates/tmpl_precipAccum_timeseries.sql
diff --git a/apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_precipGauge_timeseries.sql b/apps/scorecard/private/sqlTemplates/tmpl_precipGauge_timeseries.sql
similarity index 100%
rename from apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_precipGauge_timeseries.sql
rename to apps/scorecard/private/sqlTemplates/tmpl_precipGauge_timeseries.sql
diff --git a/apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_precipitation1hr_timeseries.sql b/apps/scorecard/private/sqlTemplates/tmpl_precipitation1hr_timeseries.sql
similarity index 100%
rename from apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_precipitation1hr_timeseries.sql
rename to apps/scorecard/private/sqlTemplates/tmpl_precipitation1hr_timeseries.sql
diff --git a/apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_radar_timeseries.sql b/apps/scorecard/private/sqlTemplates/tmpl_radar_timeseries.sql
similarity index 100%
rename from apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_radar_timeseries.sql
rename to apps/scorecard/private/sqlTemplates/tmpl_radar_timeseries.sql
diff --git a/apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_surface_timeseries.sql b/apps/scorecard/private/sqlTemplates/tmpl_surface_timeseries.sql
similarity index 100%
rename from apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_surface_timeseries.sql
rename to apps/scorecard/private/sqlTemplates/tmpl_surface_timeseries.sql
diff --git a/apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_upperair_timeseries.sql b/apps/scorecard/private/sqlTemplates/tmpl_upperair_timeseries.sql
similarity index 100%
rename from apps/scorecard/server/dataFunctions/sqlTemplates/tmpl_upperair_timeseries.sql
rename to apps/scorecard/private/sqlTemplates/tmpl_upperair_timeseries.sql
diff --git a/apps/scorecard/server/dataFunctions/sqlTemplates b/apps/scorecard/server/dataFunctions/sqlTemplates
new file mode 120000
index 0000000000..c839d49722
--- /dev/null
+++ b/apps/scorecard/server/dataFunctions/sqlTemplates
@@ -0,0 +1 @@
+../../private/sqlTemplates
\ No newline at end of file