diff --git a/ADApp/op/opi/ADPlugins.opi b/ADApp/op/opi/ADPlugins.opi
index fbcd895..80d340a 100644
--- a/ADApp/op/opi/ADPlugins.opi
+++ b/ADApp/op/opi/ADPlugins.opi
@@ -726,7 +726,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <S>scan1</S>
diff --git a/ADApp/op/opi/ADTop.opi b/ADApp/op/opi/ADTop.opi
index 46c3ff9..122ca4f 100644
--- a/ADApp/op/opi/ADTop.opi
+++ b/ADApp/op/opi/ADTop.opi
@@ -590,7 +590,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <P>13PS1:</P>
@@ -1236,7 +1236,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <P>13PIL1:</P>
@@ -1756,7 +1756,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <P>13MARCCD1:</P>
@@ -2276,7 +2276,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <P>13ROPER1:</P>
@@ -2796,7 +2796,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <P>13MAR345_1:</P>
@@ -3316,7 +3316,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <P>13PE1:</P>
@@ -3836,7 +3836,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <P>13PVCAM1:</P>
@@ -4356,7 +4356,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <P>13FW1:</P>
@@ -4896,7 +4896,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <P>13SIM1:</P>
@@ -5416,7 +5416,7 @@ $(pv_value)</tooltip>
           <description>Overlays 1-8</description>
         </action>
         <action type="OPEN_OPI_IN_VIEW">
-          <path>scan_more.opi</path>
+          <path>../sscan/scan_more.opi</path>
           <macros>
             <include_parent_macros>true</include_parent_macros>
             <P>13PVCAM1:</P>
@@ -6148,7 +6148,7 @@ $(pv_value)</tooltip>
         <description>Overlays 1-8</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>scan_more.opi</path>
+        <path>../sscan/scan_more.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <P>13PVCAM1:</P>
diff --git a/ADApp/op/opi/NDPluginBase.opi b/ADApp/op/opi/NDPluginBase.opi
index b2968d6..4400cb6 100644
--- a/ADApp/op/opi/NDPluginBase.opi
+++ b/ADApp/op/opi/NDPluginBase.opi
@@ -1843,7 +1843,7 @@ $(pv_value)</tooltip>
     <y>454</y>
     <actions hook="false">
       <action type="OPEN_OPI_IN_VIEW">
-        <path>asynRecord.opi</path>
+        <path>../asyn/asynRecord.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <R>$(R)AsynIO</R>
diff --git a/ADApp/op/opi/NDStats.opi b/ADApp/op/opi/NDStats.opi
index 924f825..3b4291e 100644
--- a/ADApp/op/opi/NDStats.opi
+++ b/ADApp/op/opi/NDStats.opi
@@ -3816,7 +3816,7 @@ $(pv_value)</tooltip>
     <y>197</y>
     <actions hook="false">
       <action type="OPEN_DISPLAY">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R)TotalArray</M>
@@ -3825,7 +3825,7 @@ $(pv_value)</tooltip>
         <description>Total MCA</description>
       </action>
       <action type="OPEN_DISPLAY">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R)NetArray</M>
diff --git a/ADApp/op/opi/NDStats5.opi b/ADApp/op/opi/NDStats5.opi
index bb62a7d..17ee775 100644
--- a/ADApp/op/opi/NDStats5.opi
+++ b/ADApp/op/opi/NDStats5.opi
@@ -4846,7 +4846,7 @@ $(pv_value)</tooltip>
         <description>Statistics #1 full</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R1)TotalArray</M>
@@ -4855,7 +4855,7 @@ $(pv_value)</tooltip>
         <description>Total MCA</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R1)NetArray</M>
@@ -5160,7 +5160,7 @@ $(pv_value)</tooltip>
         <description>Statistics #1 full</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R2)TotalArray</M>
@@ -5169,7 +5169,7 @@ $(pv_value)</tooltip>
         <description>Total MCA</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R2)NetArray</M>
@@ -5224,7 +5224,7 @@ $(pv_value)</tooltip>
         <description>Statistics #1 full</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R3)TotalArray</M>
@@ -5233,7 +5233,7 @@ $(pv_value)</tooltip>
         <description>Total MCA</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R3)NetArray</M>
@@ -5288,7 +5288,7 @@ $(pv_value)</tooltip>
         <description>Statistics #1 full</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R4)TotalArray</M>
@@ -5297,7 +5297,7 @@ $(pv_value)</tooltip>
         <description>Total MCA</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R4)NetArray</M>
@@ -5352,7 +5352,7 @@ $(pv_value)</tooltip>
         <description>Statistics #1 full</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R5)TotalArray</M>
@@ -5361,7 +5361,7 @@ $(pv_value)</tooltip>
         <description>Total MCA</description>
       </action>
       <action type="OPEN_OPI_IN_VIEW">
-        <path>mca.opi</path>
+        <path>../mca/mca.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <M>$(R5)NetArray</M>