diff --git a/app/pods/protected/strains/show/measurements-table-row/component.js b/app/pods/protected/strains/measurements-table-row/component.js
similarity index 100%
rename from app/pods/protected/strains/show/measurements-table-row/component.js
rename to app/pods/protected/strains/measurements-table-row/component.js
diff --git a/app/pods/protected/strains/show/measurements-table-row/template.hbs b/app/pods/protected/strains/measurements-table-row/template.hbs
similarity index 100%
rename from app/pods/protected/strains/show/measurements-table-row/template.hbs
rename to app/pods/protected/strains/measurements-table-row/template.hbs
diff --git a/app/pods/protected/strains/show/measurements-table/component.js b/app/pods/protected/strains/measurements-table/component.js
similarity index 100%
rename from app/pods/protected/strains/show/measurements-table/component.js
rename to app/pods/protected/strains/measurements-table/component.js
diff --git a/app/pods/protected/strains/show/loading/template.hbs b/app/pods/protected/strains/measurements-table/loading/template.hbs
similarity index 100%
rename from app/pods/protected/strains/show/loading/template.hbs
rename to app/pods/protected/strains/measurements-table/loading/template.hbs
diff --git a/app/pods/protected/strains/show/measurements-table/template.hbs b/app/pods/protected/strains/measurements-table/template.hbs
similarity index 96%
rename from app/pods/protected/strains/show/measurements-table/template.hbs
rename to app/pods/protected/strains/measurements-table/template.hbs
index a9a45dd..25b0c27 100644
--- a/app/pods/protected/strains/show/measurements-table/template.hbs
+++ b/app/pods/protected/strains/measurements-table/template.hbs
@@ -41,7 +41,7 @@
   <tbody>
     {{#each sortedMeasurements as |measurement|}}
       {{
-        protected/strains/show/measurements-table-row
+        protected/strains/measurements-table-row
         row=measurement
         canEdit=canEdit
       }}
diff --git a/app/pods/protected/strains/show/measurements-table/loading/template.hbs b/app/pods/protected/strains/show/measurements-table/loading/template.hbs
deleted file mode 100644
index e5a3e05..0000000
--- a/app/pods/protected/strains/show/measurements-table/loading/template.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{loading-panel}}
diff --git a/app/pods/protected/strains/show/strain-card/template.hbs b/app/pods/protected/strains/show/strain-card/template.hbs
index 58ff553..86e281f 100644
--- a/app/pods/protected/strains/show/strain-card/template.hbs
+++ b/app/pods/protected/strains/show/strain-card/template.hbs
@@ -74,7 +74,7 @@
         <dt>Characteristics</dt>
         <dd>
           {{
-            protected/strains/show/measurements-table
+            protected/strains/measurements-table
             model=strain
             canEdit=false
             canAdd=false
diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs
index ea27230..908020f 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -51,7 +51,7 @@
   </fieldset>
   <div>
     {{
-      protected/strains/show/measurements-table
+      protected/strains/measurements-table
       model=strain
       canEdit=strain.canEdit
       canAdd=canAdd