diff --git a/common/PointList.h b/analysis/PointList.h
similarity index 100%
rename from common/PointList.h
rename to analysis/PointList.h
diff --git a/common/TwoPhase.cpp b/analysis/TwoPhase.cpp
similarity index 99%
rename from common/TwoPhase.cpp
rename to analysis/TwoPhase.cpp
index ab8beef1..ed171980 100644
--- a/common/TwoPhase.cpp
+++ b/analysis/TwoPhase.cpp
@@ -1,8 +1,8 @@
-#include "TwoPhase.h"
+#include "analysis/TwoPhase.h"
 
-#include "pmmc.h"
-#include "Domain.h"
-#include "Communication.h"
+#include "analysis/pmmc.h"
+#include "common/Domain.h"
+#include "common/Communication.h"
 #include "analysis/analysis.h"
 
 #include "shared_ptr.h"
diff --git a/common/TwoPhase.h b/analysis/TwoPhase.h
similarity index 98%
rename from common/TwoPhase.h
rename to analysis/TwoPhase.h
index 0daf30a6..db0537ac 100644
--- a/common/TwoPhase.h
+++ b/analysis/TwoPhase.h
@@ -4,9 +4,9 @@
 
 #include <vector>
 
-#include "pmmc.h"
-#include "Domain.h"
-#include "Communication.h"
+#include "analysis/pmmc.h"
+#include "common/Domain.h"
+#include "common/Communication.h"
 #include "analysis/analysis.h"
 
 #include "shared_ptr.h"
diff --git a/common/histogram.h b/analysis/histogram.h
similarity index 100%
rename from common/histogram.h
rename to analysis/histogram.h
diff --git a/common/imfilter.h b/analysis/imfilter.h
similarity index 100%
rename from common/imfilter.h
rename to analysis/imfilter.h
diff --git a/common/imfilter.hpp b/analysis/imfilter.hpp
similarity index 100%
rename from common/imfilter.hpp
rename to analysis/imfilter.hpp
diff --git a/common/pmmc.h b/analysis/pmmc.h
similarity index 100%
rename from common/pmmc.h
rename to analysis/pmmc.h