diff --git a/observation_flat_view_test_input.json b/observation_flat_view_test_input.json
deleted file mode 100644
index bd990ef..0000000
--- a/observation_flat_view_test_input.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "resourceType": "Observation",
-  "status": "registered",
-  "category": [
-    {
-      "coding": [
-        {
-          "system": "http://terminology.hl7.org/CodeSystem/observation-category",
-          "code": "provider-speciality",
-          "display": "Provider speciality"
-        }
-      ]
-    }
-  ],
-  "effectiveDateTime": "2024-10-01T09:00:00Z",
-  "valueString": "Pediatrician",
-  "encounter": {
-    "reference": "Encounter/109601-5-400388",
-    "type": "Encounter"
-  },
-  "hasMember": [
-    {
-      "type": "Observation",
-      "reference": "Observation/5008"
-    }
-  ]
-}
diff --git a/condition_flat_view.json b/views/condition_flat_view.json
similarity index 97%
rename from condition_flat_view.json
rename to views/condition_flat_view.json
index aa19f52..897e6ae 100644
--- a/condition_flat_view.json
+++ b/views/condition_flat_view.json
@@ -6,7 +6,7 @@
     {
       "column": [
         {
-          "path": "id",
+          "path": "getResourceKey()",
           "name": "id",
           "type": "string"
         },
diff --git a/encounter_flat_view.json b/views/encounter_flat_view.json
similarity index 98%
rename from encounter_flat_view.json
rename to views/encounter_flat_view.json
index 18b7669..e74ec0d 100644
--- a/encounter_flat_view.json
+++ b/views/encounter_flat_view.json
@@ -8,7 +8,7 @@
     {
       "column": [
         {
-          "path": "id",
+          "path": "getResourceKey()",
           "name": "id",
           "type": "string"
         },
diff --git a/observation_flat_view.json b/views/observation_flat_view.json
similarity index 98%
rename from observation_flat_view.json
rename to views/observation_flat_view.json
index 044ae20..6b80106 100644
--- a/observation_flat_view.json
+++ b/views/observation_flat_view.json
@@ -6,7 +6,7 @@
     {
       "column": [
         {
-          "path": "id",
+          "path": "getResourceKey()",
           "name": "id",
           "type": "string"
         },
diff --git a/organization_flat_view.json b/views/organization_flat_view.json
similarity index 96%
rename from organization_flat_view.json
rename to views/organization_flat_view.json
index 31110b6..f009344 100644
--- a/organization_flat_view.json
+++ b/views/organization_flat_view.json
@@ -6,7 +6,7 @@
     {
       "column": [
         {
-          "path": "id",
+          "path": "getResourceKey()",
           "name": "id"
         },
         {