diff --git a/src/src/measure/ActorDraggableInteractorStyle.cpp b/src/src/Interaction/ActorDraggableInteractorStyle.cpp
similarity index 99%
rename from src/src/measure/ActorDraggableInteractorStyle.cpp
rename to src/src/Interaction/ActorDraggableInteractorStyle.cpp
index b150ed8..17a8cd2 100644
--- a/src/src/measure/ActorDraggableInteractorStyle.cpp
+++ b/src/src/Interaction/ActorDraggableInteractorStyle.cpp
@@ -21,7 +21,7 @@
 #include <vtkImageProperty.h>
 #include <vtkPointData.h>
 
-#include "DraggableActor.h"
+#include "src/src/measure/DraggableActor.h"
 #include "QGlobals.h"
 
 vtkStandardNewMacro(ActorDraggableInteractorStyle)
diff --git a/src/src/measure/ActorDraggableInteractorStyle.h b/src/src/Interaction/ActorDraggableInteractorStyle.h
similarity index 100%
rename from src/src/measure/ActorDraggableInteractorStyle.h
rename to src/src/Interaction/ActorDraggableInteractorStyle.h
diff --git a/src/src/QDicomViewer.cpp b/src/src/QDicomViewer.cpp
index 1be0202..6cb459c 100644
--- a/src/src/QDicomViewer.cpp
+++ b/src/src/QDicomViewer.cpp
@@ -15,7 +15,7 @@
 #include "cine/pqVCRToolbar.h"
 
 #include <QMessageBox>
-#include "measure/ActorDraggableInteractorStyle.h"
+#include "Interaction/ActorDraggableInteractorStyle.h"
 
 /************************************************************************
 * Consider:
diff --git a/src/src/Rendering/infinitiViewer.cxx b/src/src/Rendering/infinitiViewer.cxx
index 606a2a9..56db2d3 100644
--- a/src/src/Rendering/infinitiViewer.cxx
+++ b/src/src/Rendering/infinitiViewer.cxx
@@ -3,7 +3,7 @@
 #include "vtkCommand.h"
 #include "vtkImageData.h"
 #include "vtkInformation.h"
-#include "measure/ActorDraggableInteractorStyle.h"
+#include "Interaction/ActorDraggableInteractorStyle.h"
 #include "vtkObjectFactory.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderWindowInteractor.h"
diff --git a/src/src/measure/RulerAnnotationActor.cpp b/src/src/measure/RulerAnnotationActor.cpp
index bba00b0..37e2ee5 100644
--- a/src/src/measure/RulerAnnotationActor.cpp
+++ b/src/src/measure/RulerAnnotationActor.cpp
@@ -13,7 +13,7 @@
 #include <vtkTextMapper.h>
 #include <vtkTextProperty.h>
 
-#include "ActorDraggableInteractorStyle.h"
+#include "Interaction/ActorDraggableInteractorStyle.h"
 #include "ControlPointActor.h"
 #include "calibrationWidget.h"
 
diff --git a/src/src/measure/TextAnnotationActor.cpp b/src/src/measure/TextAnnotationActor.cpp
index 77b0c35..4da52f1 100644
--- a/src/src/measure/TextAnnotationActor.cpp
+++ b/src/src/measure/TextAnnotationActor.cpp
@@ -13,7 +13,7 @@
 #include <vtkRenderWindowInteractor.h>
 
 #include "pqFontPropertyWidget.h"
-#include "ActorDraggableInteractorStyle.h"
+#include "Interaction/ActorDraggableInteractorStyle.h"
 
 vtkStandardNewMacro(TextAnnotationActor)
 
diff --git a/src/src/view/dicomimageview.cpp b/src/src/view/dicomimageview.cpp
index 8b5bcb6..8d63b26 100644
--- a/src/src/view/dicomimageview.cpp
+++ b/src/src/view/dicomimageview.cpp
@@ -6,7 +6,7 @@
 #include "vtkImageProperty.h"
 #include "view/subview/mytitlebar.h"
 
-#include "measure/ActorDraggableInteractorStyle.h"
+#include "Interaction/ActorDraggableInteractorStyle.h"
 #include "cine/pqVCRController.h"
 #include "cine/pqVCRToolbar.h"
 #include "vtkDiscretizableColorTransferFunction.h"
diff --git a/src/src/view/viewcontainerwidget.cpp b/src/src/view/viewcontainerwidget.cpp
index e7b1a86..4acd7bd 100644
--- a/src/src/view/viewcontainerwidget.cpp
+++ b/src/src/view/viewcontainerwidget.cpp
@@ -11,7 +11,7 @@
 #include "qpainter.h"
 #include "cine/pqVCRToolbar.h"
 #include <QMessageBox>
-#include "measure/ActorDraggableInteractorStyle.h"
+#include "Interaction/ActorDraggableInteractorStyle.h"
 #include "measure/MeasureFactory.h"
 //-------------------------------------------------------