diff --git a/extensions/measurement-tracking/src/Panels/PanelMeasurementTableTracking/index.js b/extensions/measurement-tracking/src/panels2/PanelMeasurementTableTracking/index.js
similarity index 100%
rename from extensions/measurement-tracking/src/Panels/PanelMeasurementTableTracking/index.js
rename to extensions/measurement-tracking/src/panels2/PanelMeasurementTableTracking/index.js
diff --git a/extensions/measurement-tracking/src/Panels/PanelStudyBrowserTracking/PanelStudyBrowser.jsx b/extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/PanelStudyBrowser.jsx
similarity index 100%
rename from extensions/measurement-tracking/src/Panels/PanelStudyBrowserTracking/PanelStudyBrowser.jsx
rename to extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/PanelStudyBrowser.jsx
diff --git a/extensions/measurement-tracking/src/Panels/PanelStudyBrowserTracking/getImageSrcFromImageId.js b/extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/getImageSrcFromImageId.js
similarity index 100%
rename from extensions/measurement-tracking/src/Panels/PanelStudyBrowserTracking/getImageSrcFromImageId.js
rename to extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/getImageSrcFromImageId.js
diff --git a/extensions/measurement-tracking/src/Panels/PanelStudyBrowserTracking/getStudiesForPatientByStudyInstanceUID.js b/extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/getStudiesForPatientByStudyInstanceUID.js
similarity index 100%
rename from extensions/measurement-tracking/src/Panels/PanelStudyBrowserTracking/getStudiesForPatientByStudyInstanceUID.js
rename to extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/getStudiesForPatientByStudyInstanceUID.js
diff --git a/extensions/measurement-tracking/src/Panels/PanelStudyBrowserTracking/index.jsx b/extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/index.jsx
similarity index 100%
rename from extensions/measurement-tracking/src/Panels/PanelStudyBrowserTracking/index.jsx
rename to extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/index.jsx
diff --git a/extensions/measurement-tracking/src/Panels/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js b/extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js
similarity index 100%
rename from extensions/measurement-tracking/src/Panels/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js
rename to extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js
diff --git a/extensions/measurement-tracking/src/Panels/index.js b/extensions/measurement-tracking/src/panels2/index.js
similarity index 100%
rename from extensions/measurement-tracking/src/Panels/index.js
rename to extensions/measurement-tracking/src/panels2/index.js
diff --git a/extensions/measurement-tracking/src/Viewports/OHIFCornerstoneViewport.js b/extensions/measurement-tracking/src/viewports2/OHIFCornerstoneViewport.js
similarity index 100%
rename from extensions/measurement-tracking/src/Viewports/OHIFCornerstoneViewport.js
rename to extensions/measurement-tracking/src/viewports2/OHIFCornerstoneViewport.js