diff --git a/Applications/DataExplorer/Base/CMakeLists.txt b/Applications/DataExplorer/Base/CMakeLists.txt
index a86ef47ce4da8ac0b64e5a0e0fd464b2ed020782..caa0c4c0b5b677ef0a704a7672ece4e630033aad 100644
--- a/Applications/DataExplorer/Base/CMakeLists.txt
+++ b/Applications/DataExplorer/Base/CMakeLists.txt
@@ -10,6 +10,7 @@ set(SOURCES
 	# modeltest.cpp # Not needed
 	CheckboxDelegate.cpp
 	QValueTooltipSlider.cpp
+	Color.cpp
 )
 
 # Moc headers
diff --git a/GeoLib/Color.cpp b/Applications/DataExplorer/Base/Color.cpp
similarity index 97%
rename from GeoLib/Color.cpp
rename to Applications/DataExplorer/Base/Color.cpp
index a3319f015344ab7d555a5b0648d20e7a3830a5b3..6aa80d137314c63e545b789d6186c7040e10db68 100644
--- a/GeoLib/Color.cpp
+++ b/Applications/DataExplorer/Base/Color.cpp
@@ -12,14 +12,14 @@
  *
  */
 
-#include <iostream>
+#include "Color.h"
+
 #include <fstream>
 #include <sstream>
 
 #include <logog/include/logog.hpp>
 
-#include "Color.h"
-#include "StringTools.h"
+#include "BaseLib/StringTools.h"
 
 namespace GeoLib {
 
diff --git a/GeoLib/Color.h b/Applications/DataExplorer/Base/Color.h
similarity index 97%
rename from GeoLib/Color.h
rename to Applications/DataExplorer/Base/Color.h
index 6a7ef328264cb6a20a8660c0088b8f763e028afc..edeabf67e851821957c53cb11e3041aa341f350b 100644
--- a/GeoLib/Color.h
+++ b/Applications/DataExplorer/Base/Color.h
@@ -16,11 +16,11 @@
 #ifndef COLOR_H_
 #define COLOR_H_
 
-#include "TemplatePoint.h"
-
 #include <map>
 #include <string>
 
+#include "MathLib/TemplatePoint.h"
+
 namespace GeoLib
 {
 typedef MathLib::TemplatePoint<unsigned char> Color;