diff --git a/src/src/measure/Measure.cpp b/src/src/Rendering/Measure/Measure.cpp
similarity index 100%
rename from src/src/measure/Measure.cpp
rename to src/src/Rendering/Measure/Measure.cpp
diff --git a/src/src/measure/Measure.h b/src/src/Rendering/Measure/Measure.h
similarity index 100%
rename from src/src/measure/Measure.h
rename to src/src/Rendering/Measure/Measure.h
diff --git a/src/src/measure/MeasureFactory.cpp b/src/src/Rendering/Measure/MeasureFactory.cpp
similarity index 79%
rename from src/src/measure/MeasureFactory.cpp
rename to src/src/Rendering/Measure/MeasureFactory.cpp
index 5f1bf4b..276861f 100644
--- a/src/src/measure/MeasureFactory.cpp
+++ b/src/src/Rendering/Measure/MeasureFactory.cpp
@@ -4,12 +4,12 @@
 
 #include "MeasureFactory.h"
 
-#include "RulerAnnotationActor.h"
-#include "AngleAnnotationActor.h"
-#include "OpenPolyAnnotationActor.h"
-#include "TextAnnotationActor.h"
-#include "ArrowAnnotationActor.h"
-#include "EllipseAnnotationActor.h"
+#include "measure/RulerAnnotationActor.h"
+#include "measure/AngleAnnotationActor.h"
+#include "measure/OpenPolyAnnotationActor.h"
+#include "measure/TextAnnotationActor.h"
+#include "measure/ArrowAnnotationActor.h"
+#include "measure/EllipseAnnotationActor.h"
 
 Measure *MeasureFactory::getMeasure(AnnotationActorType type) {
     switch (type) {
diff --git a/src/src/measure/MeasureFactory.h b/src/src/Rendering/Measure/MeasureFactory.h
similarity index 100%
rename from src/src/measure/MeasureFactory.h
rename to src/src/Rendering/Measure/MeasureFactory.h
diff --git a/src/src/measure/MeasureStore.cpp b/src/src/Rendering/Measure/MeasureStore.cpp
similarity index 100%
rename from src/src/measure/MeasureStore.cpp
rename to src/src/Rendering/Measure/MeasureStore.cpp
diff --git a/src/src/measure/MeasureStore.h b/src/src/Rendering/Measure/MeasureStore.h
similarity index 100%
rename from src/src/measure/MeasureStore.h
rename to src/src/Rendering/Measure/MeasureStore.h
diff --git a/src/src/Rendering/infinitiViewer.cxx b/src/src/Rendering/infinitiViewer.cxx
index 32fd152..06574ab 100644
--- a/src/src/Rendering/infinitiViewer.cxx
+++ b/src/src/Rendering/infinitiViewer.cxx
@@ -18,7 +18,7 @@
 #include "vtkPiecewiseFunction.h"
 #include "vector"
 #include "vtkCornerAnnotation.h"
-#include "measure/MeasureStore.h"
+#include "Rendering/Measure/MeasureStore.h"
 #include "vtkTextActor.h"
 #include "vtkTextProperty.h"
 #include "IO/General/ColorMapReader.h"
diff --git a/src/src/UI/Widget/viewcontainerwidget.cpp b/src/src/UI/Widget/viewcontainerwidget.cpp
index 23aa258..dd948ac 100644
--- a/src/src/UI/Widget/viewcontainerwidget.cpp
+++ b/src/src/UI/Widget/viewcontainerwidget.cpp
@@ -13,7 +13,7 @@
 #include "cine/pqVCRToolbar.h"
 #include <QMessageBox>
 #include "Interaction/ActorDraggableInteractorStyle.h"
-#include "measure/MeasureFactory.h"
+#include "Rendering/Measure/MeasureFactory.h"
 //-------------------------------------------------------
 
 
diff --git a/src/src/measure/AngleAnnotationActor.h b/src/src/measure/AngleAnnotationActor.h
index 6a99691..73725b3 100644
--- a/src/src/measure/AngleAnnotationActor.h
+++ b/src/src/measure/AngleAnnotationActor.h
@@ -7,7 +7,7 @@
 
 
 #include "DraggableActor.h"
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class ControlPointActor;
 
diff --git a/src/src/measure/DraggableActor.h b/src/src/measure/DraggableActor.h
index eb41b78..6137588 100644
--- a/src/src/measure/DraggableActor.h
+++ b/src/src/measure/DraggableActor.h
@@ -9,7 +9,7 @@
 #include <vtkProp.h>
 #include <vtkCommand.h>
 
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class vtkPolyData;
 
diff --git a/src/src/measure/EllipseAnnotationActor.h b/src/src/measure/EllipseAnnotationActor.h
index 3c30cda..93a1171 100644
--- a/src/src/measure/EllipseAnnotationActor.h
+++ b/src/src/measure/EllipseAnnotationActor.h
@@ -6,7 +6,7 @@
 #define OMEGAV_EllipseANNOTATIONACTOR_H
 
 #include "DraggableActor.h"
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class vtkTextProperty;
 
diff --git a/src/src/measure/LineAnnotationActor.h b/src/src/measure/LineAnnotationActor.h
index 3a3cc0f..7597ffc 100644
--- a/src/src/measure/LineAnnotationActor.h
+++ b/src/src/measure/LineAnnotationActor.h
@@ -6,7 +6,7 @@
 #define OMEGAV_LINEANNOTATIONACTOR_H
 
 #include "DraggableActor.h"
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class ControlPointActor;
 
diff --git a/src/src/measure/OpenPolyAnnotationActor.h b/src/src/measure/OpenPolyAnnotationActor.h
index ae25b51..c9ff03e 100644
--- a/src/src/measure/OpenPolyAnnotationActor.h
+++ b/src/src/measure/OpenPolyAnnotationActor.h
@@ -6,7 +6,7 @@
 #define OMEGAV_OPENPOLYANNOTATIONACTOR_H
 
 #include "DraggableActor.h"
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class ControlPointRActor;
 
diff --git a/src/src/measure/TextAnnotationActor.h b/src/src/measure/TextAnnotationActor.h
index 235381b..1dec53c 100644
--- a/src/src/measure/TextAnnotationActor.h
+++ b/src/src/measure/TextAnnotationActor.h
@@ -10,7 +10,7 @@
 #include <vtkTextProperty.h>
 
 #include "DraggableActor.h"
-#include "Measure.h"
+#include "Rendering/Measure/Measure.h"
 
 class ControlPointActor;