diff --git a/extensions/measurement-tracking/src/getPanelModule.js b/extensions/measurement-tracking/src/getPanelModule.js
index b1ef8911d..ac48c0711 100644
--- a/extensions/measurement-tracking/src/getPanelModule.js
+++ b/extensions/measurement-tracking/src/getPanelModule.js
@@ -1,7 +1,7 @@
 import {
   PanelStudyBrowserTracking,
   PanelMeasurementTableTracking,
-} from './Panels';
+} from './panels';
 
 // TODO:
 // - No loading UI exists yet
diff --git a/extensions/measurement-tracking/src/getViewportModule.js b/extensions/measurement-tracking/src/getViewportModule.js
index b7abcf05c..1f657ec37 100644
--- a/extensions/measurement-tracking/src/getViewportModule.js
+++ b/extensions/measurement-tracking/src/getViewportModule.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 const Component = React.lazy(() => {
-  return import('./Viewports/OHIFCornerstoneViewport');
+  return import('./viewports/OHIFCornerstoneViewport');
 });
 
 const OHIFCornerstoneViewport = props => {
diff --git a/extensions/measurement-tracking/src/panels2/PanelMeasurementTableTracking/index.js b/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js
similarity index 100%
rename from extensions/measurement-tracking/src/panels2/PanelMeasurementTableTracking/index.js
rename to extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking/index.js
diff --git a/extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/PanelStudyBrowser.jsx b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowser.jsx
similarity index 100%
rename from extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/PanelStudyBrowser.jsx
rename to extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowser.jsx
diff --git a/extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/getImageSrcFromImageId.js b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/getImageSrcFromImageId.js
similarity index 100%
rename from extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/getImageSrcFromImageId.js
rename to extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/getImageSrcFromImageId.js
diff --git a/extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/getStudiesForPatientByStudyInstanceUID.js b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/getStudiesForPatientByStudyInstanceUID.js
similarity index 100%
rename from extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/getStudiesForPatientByStudyInstanceUID.js
rename to extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/getStudiesForPatientByStudyInstanceUID.js
diff --git a/extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/index.jsx b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/index.jsx
similarity index 100%
rename from extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/index.jsx
rename to extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/index.jsx
diff --git a/extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js
similarity index 100%
rename from extensions/measurement-tracking/src/panels2/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js
rename to extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/requestDisplaySetCreationForStudy.js
diff --git a/extensions/measurement-tracking/src/panels2/index.js b/extensions/measurement-tracking/src/panels/index.js
similarity index 100%
rename from extensions/measurement-tracking/src/panels2/index.js
rename to extensions/measurement-tracking/src/panels/index.js
diff --git a/extensions/measurement-tracking/src/viewports2/OHIFCornerstoneViewport.js b/extensions/measurement-tracking/src/viewports/OHIFCornerstoneViewport.js
similarity index 100%
rename from extensions/measurement-tracking/src/viewports2/OHIFCornerstoneViewport.js
rename to extensions/measurement-tracking/src/viewports/OHIFCornerstoneViewport.js