diff --git a/vnr/CMakeLists.txt b/vnr/CMakeLists.txt
index ca0cdf5..891acb0 100644
--- a/vnr/CMakeLists.txt
+++ b/vnr/CMakeLists.txt
@@ -20,7 +20,7 @@ add_definitions(
 
 include_directories(
   ${PROJECT_SOURCE_DIR}
-  ${PROJECT_SOURCE_DIR}/texthook
+  #${PROJECT_SOURCE_DIR}/texthook
 )
 
 add_subdirectory(vnrhook)
diff --git a/vnr/vnrhook/CMakeLists.txt b/vnr/vnrhook/CMakeLists.txt
index 1100fb9..e8a770a 100644
--- a/vnr/vnrhook/CMakeLists.txt
+++ b/vnr/vnrhook/CMakeLists.txt
@@ -42,15 +42,17 @@ set(vnrhook_src
   src/util/growl.h
   src/util/util.cc
   src/util/util.h
-  ${PROJECT_SOURCE_DIR}/ithsys/ithsys.cc
-  ${PROJECT_SOURCE_DIR}/disasm/disasm.cc
-  ${PROJECT_SOURCE_DIR}/memdbg/memdbg.h
-  ${PROJECT_SOURCE_DIR}/memdbg/memsearch.cc
-  ${PROJECT_SOURCE_DIR}/memdbg/memsearch.h
-  ${PROJECT_SOURCE_DIR}/mono/monoobject.h
-  ${PROJECT_SOURCE_DIR}/mono/monotype.h
+  src/util/ithsys/ithsys.cc
+  src/util/disasm/disasm.cc
+  src/util/memdbg/memdbg.h
+  src/util/memdbg/memsearch.cc
+  src/util/memdbg/memsearch.h
+  src/util/mono/monoobject.h
+  src/util/mono/monotype.h
 )
 
+include_directories(src/util)
+
 add_library(vnrhook SHARED ${vnrhook_src})
 
 enable_language(ASM_MASM)
diff --git a/vnr/cpputil/cppcstring.h b/vnr/vnrhook/src/util/cpputil/cppcstring.h
similarity index 100%
rename from vnr/cpputil/cppcstring.h
rename to vnr/vnrhook/src/util/cpputil/cppcstring.h
diff --git a/vnr/disasm/disasm.cc b/vnr/vnrhook/src/util/disasm/disasm.cc
similarity index 100%
rename from vnr/disasm/disasm.cc
rename to vnr/vnrhook/src/util/disasm/disasm.cc
diff --git a/vnr/disasm/disasm.h b/vnr/vnrhook/src/util/disasm/disasm.h
similarity index 100%
rename from vnr/disasm/disasm.h
rename to vnr/vnrhook/src/util/disasm/disasm.h
diff --git a/vnr/ithsys/ithsys.cc b/vnr/vnrhook/src/util/ithsys/ithsys.cc
similarity index 100%
rename from vnr/ithsys/ithsys.cc
rename to vnr/vnrhook/src/util/ithsys/ithsys.cc
diff --git a/vnr/ithsys/ithsys.h b/vnr/vnrhook/src/util/ithsys/ithsys.h
similarity index 100%
rename from vnr/ithsys/ithsys.h
rename to vnr/vnrhook/src/util/ithsys/ithsys.h
diff --git a/vnr/memdbg/memdbg.h b/vnr/vnrhook/src/util/memdbg/memdbg.h
similarity index 100%
rename from vnr/memdbg/memdbg.h
rename to vnr/vnrhook/src/util/memdbg/memdbg.h
diff --git a/vnr/memdbg/memsearch.cc b/vnr/vnrhook/src/util/memdbg/memsearch.cc
similarity index 100%
rename from vnr/memdbg/memsearch.cc
rename to vnr/vnrhook/src/util/memdbg/memsearch.cc
diff --git a/vnr/memdbg/memsearch.h b/vnr/vnrhook/src/util/memdbg/memsearch.h
similarity index 100%
rename from vnr/memdbg/memsearch.h
rename to vnr/vnrhook/src/util/memdbg/memsearch.h
diff --git a/vnr/mono/monoobject.h b/vnr/vnrhook/src/util/mono/monoobject.h
similarity index 100%
rename from vnr/mono/monoobject.h
rename to vnr/vnrhook/src/util/mono/monoobject.h
diff --git a/vnr/mono/monotype.h b/vnr/vnrhook/src/util/mono/monotype.h
similarity index 100%
rename from vnr/mono/monotype.h
rename to vnr/vnrhook/src/util/mono/monotype.h
diff --git a/vnr/ntdll/ntdll.h b/vnr/vnrhook/src/util/ntdll/ntdll.h
similarity index 100%
rename from vnr/ntdll/ntdll.h
rename to vnr/vnrhook/src/util/ntdll/ntdll.h