diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a33555..81ace21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,12 +165,6 @@ add_executable(pdf2htmlEX
     src/BackgroundRenderer/SplashBackgroundRenderer.cc 
     src/BackgroundRenderer/CairoBackgroundRenderer.h 
     src/BackgroundRenderer/CairoBackgroundRenderer.cc 
-    src/util/ArgParser.h
-    src/util/ArgParser.cc
-    src/util/base64stream.h
-    src/util/base64stream.cc
-    src/util/color.h
-    src/util/color.cc
     src/util/const.h
     src/util/const.cc
     src/util/css_const.h
@@ -178,7 +172,6 @@ add_executable(pdf2htmlEX
     src/util/encoding.cc
     src/util/ffw.h
     src/util/ffw.c
-    src/util/HTMLState.h
     src/util/math.h
     src/util/math.cc
     src/util/misc.h
@@ -186,16 +179,23 @@ add_executable(pdf2htmlEX
     src/util/namespace.h
     src/util/path.h
     src/util/path.cc
-    src/util/Preprocessor.h
-    src/util/Preprocessor.cc
-    src/util/StringFormatter.h
-    src/util/StringFormatter.cc
-    src/util/TextLineBuffer.h
-    src/util/TextLineBuffer.cc
-    src/util/TmpFiles.h
-    src/util/TmpFiles.cc
     src/util/unicode.h
     src/util/unicode.cc
+    src/HTMLState.h
+    src/ArgParser.h
+    src/ArgParser.cc
+    src/base64stream.h
+    src/base64stream.cc
+    src/Color.h
+    src/Color.cc
+    src/Preprocessor.h
+    src/Preprocessor.cc
+    src/StringFormatter.h
+    src/StringFormatter.cc
+    src/TextLineBuffer.h
+    src/TextLineBuffer.cc
+    src/TmpFiles.h
+    src/TmpFiles.cc
     )
 target_link_libraries(pdf2htmlEX ${PDF2HTMLEX_LIBS})
 
diff --git a/src/util/ArgParser.cc b/src/ArgParser.cc
similarity index 100%
rename from src/util/ArgParser.cc
rename to src/ArgParser.cc
diff --git a/src/util/ArgParser.h b/src/ArgParser.h
similarity index 100%
rename from src/util/ArgParser.h
rename to src/ArgParser.h
diff --git a/src/util/color.cc b/src/Color.cc
similarity index 91%
rename from src/util/color.cc
rename to src/Color.cc
index a220052..3c06fca 100644
--- a/src/util/color.cc
+++ b/src/Color.cc
@@ -1,4 +1,5 @@
-#include "util/color.h"
+#include "Color.h"
+
 #include "util/misc.h"
 
 namespace pdf2htmlEX {
diff --git a/src/util/color.h b/src/Color.h
similarity index 100%
rename from src/util/color.h
rename to src/Color.h
diff --git a/src/HTMLRenderer/HTMLRenderer.h b/src/HTMLRenderer/HTMLRenderer.h
index 3323a47..5547261 100644
--- a/src/HTMLRenderer/HTMLRenderer.h
+++ b/src/HTMLRenderer/HTMLRenderer.h
@@ -22,14 +22,15 @@
 #include <Annot.h>
 
 #include "Param.h"
-#include "util/Preprocessor.h"
+#include "Preprocessor.h"
+#include "StringFormatter.h"
+#include "TmpFiles.h"
+#include "Color.h"
+#include "StateManager.h"
+#include "TextLineBuffer.h"
+
 #include "util/const.h"
-#include "util/StringFormatter.h"
-#include "util/TmpFiles.h"
 #include "util/misc.h"
-#include "util/color.h"
-#include "util/StateManager.h"
-#include "util/TextLineBuffer.h"
 
 namespace pdf2htmlEX {
 
diff --git a/src/HTMLRenderer/font.cc b/src/HTMLRenderer/font.cc
index e60a5f5..fd3f2e8 100644
--- a/src/HTMLRenderer/font.cc
+++ b/src/HTMLRenderer/font.cc
@@ -19,10 +19,11 @@
 
 #include "Param.h"
 #include "HTMLRenderer.h"
+#include "base64stream.h"
+
 #include "util/namespace.h"
 #include "util/math.h"
 #include "util/misc.h"
-#include "util/base64stream.h"
 #include "util/ffw.h"
 #include "util/path.h"
 #include "util/unicode.h"
diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc
index 7930fed..624779f 100644
--- a/src/HTMLRenderer/general.cc
+++ b/src/HTMLRenderer/general.cc
@@ -14,13 +14,14 @@
 
 #include <GlobalParams.h>
 
-#include "HTMLRenderer.h"
-#include "util/TextLineBuffer.h"
 #include "pdf2htmlEX-config.h"
+#include "HTMLRenderer.h"
+#include "TextLineBuffer.h"
 #include "BackgroundRenderer/BackgroundRenderer.h"
+#include "base64stream.h"
+
 #include "util/namespace.h"
 #include "util/ffw.h"
-#include "util/base64stream.h"
 #include "util/math.h"
 #include "util/path.h"
 #include "util/css_const.h"
diff --git a/src/HTMLRenderer/state.cc b/src/HTMLRenderer/state.cc
index 171d124..80f8a48 100644
--- a/src/HTMLRenderer/state.cc
+++ b/src/HTMLRenderer/state.cc
@@ -10,7 +10,7 @@
 #include <algorithm>
 
 #include "HTMLRenderer.h"
-#include "util/TextLineBuffer.h"
+
 #include "util/namespace.h"
 #include "util/math.h"
 
diff --git a/src/HTMLRenderer/text.cc b/src/HTMLRenderer/text.cc
index 9a7ee23..84f9976 100644
--- a/src/HTMLRenderer/text.cc
+++ b/src/HTMLRenderer/text.cc
@@ -10,7 +10,7 @@
 #include <algorithm>
 
 #include "HTMLRenderer.h"
-#include "util/TextLineBuffer.h"
+
 #include "util/namespace.h"
 #include "util/unicode.h"
 
diff --git a/src/util/HTMLState.h b/src/HTMLState.h
similarity index 96%
rename from src/util/HTMLState.h
rename to src/HTMLState.h
index 1a627dd..2f07766 100644
--- a/src/util/HTMLState.h
+++ b/src/HTMLState.h
@@ -5,7 +5,7 @@
 #ifndef HTMLSTATE_H__
 #define HTMLSTATE_H__
 
-#include "util/color.h"
+#include "Color.h"
 
 namespace pdf2htmlEX {
 
diff --git a/src/util/Preprocessor.cc b/src/Preprocessor.cc
similarity index 100%
rename from src/util/Preprocessor.cc
rename to src/Preprocessor.cc
diff --git a/src/util/Preprocessor.h b/src/Preprocessor.h
similarity index 100%
rename from src/util/Preprocessor.h
rename to src/Preprocessor.h
diff --git a/src/util/StateManager.h b/src/StateManager.h
similarity index 99%
rename from src/util/StateManager.h
rename to src/StateManager.h
index 6698da0..5fe8bf6 100644
--- a/src/util/StateManager.h
+++ b/src/StateManager.h
@@ -13,9 +13,10 @@
 #include <map>
 #include <unordered_map>
 
+#include "Color.h"
+
 #include "util/math.h"
 #include "util/css_const.h"
-#include "util/color.h"
 
 namespace pdf2htmlEX {
 
diff --git a/src/util/StringFormatter.cc b/src/StringFormatter.cc
similarity index 100%
rename from src/util/StringFormatter.cc
rename to src/StringFormatter.cc
diff --git a/src/util/StringFormatter.h b/src/StringFormatter.h
similarity index 100%
rename from src/util/StringFormatter.h
rename to src/StringFormatter.h
diff --git a/src/util/TextLineBuffer.cc b/src/TextLineBuffer.cc
similarity index 99%
rename from src/util/TextLineBuffer.cc
rename to src/TextLineBuffer.cc
index 92724fe..64aa3ea 100644
--- a/src/util/TextLineBuffer.cc
+++ b/src/TextLineBuffer.cc
@@ -10,8 +10,8 @@
 #include <cmath>
 #include <algorithm>
 
-#include "HTMLRenderer/HTMLRenderer.h"
-#include "util/TextLineBuffer.h"
+#include "TextLineBuffer.h"
+
 #include "util/namespace.h"
 #include "util/unicode.h"
 #include "util/math.h"
diff --git a/src/util/TextLineBuffer.h b/src/TextLineBuffer.h
similarity index 97%
rename from src/util/TextLineBuffer.h
rename to src/TextLineBuffer.h
index 50fe89c..550415b 100644
--- a/src/util/TextLineBuffer.h
+++ b/src/TextLineBuffer.h
@@ -4,9 +4,11 @@
 #include <iostream>
 #include <vector>
 
+#include <CharTypes.h>
+
 #include "Param.h"
-#include "util/StateManager.h"
-#include "util/HTMLState.h"
+#include "StateManager.h"
+#include "HTMLState.h"
 
 namespace pdf2htmlEX {
 
diff --git a/src/util/TmpFiles.cc b/src/TmpFiles.cc
similarity index 100%
rename from src/util/TmpFiles.cc
rename to src/TmpFiles.cc
diff --git a/src/util/TmpFiles.h b/src/TmpFiles.h
similarity index 100%
rename from src/util/TmpFiles.h
rename to src/TmpFiles.h
diff --git a/src/util/base64stream.cc b/src/base64stream.cc
similarity index 100%
rename from src/util/base64stream.cc
rename to src/base64stream.cc
diff --git a/src/util/base64stream.h b/src/base64stream.h
similarity index 100%
rename from src/util/base64stream.h
rename to src/base64stream.h
diff --git a/src/pdf2htmlEX.cc b/src/pdf2htmlEX.cc
index d8a59f7..855dd4b 100644
--- a/src/pdf2htmlEX.cc
+++ b/src/pdf2htmlEX.cc
@@ -21,10 +21,11 @@
 #include <PDFDocFactory.h>
 #include <GlobalParams.h>
 
-#include "Param.h"
 #include "pdf2htmlEX-config.h"
+#include "ArgParser.h"
+#include "Param.h"
 #include "HTMLRenderer/HTMLRenderer.h"
-#include "util/ArgParser.h"
+
 #include "util/path.h"
 #include "util/ffw.h"