diff --git a/ChewingPreferences/AboutDialog.h b/ChewingPreferences/AboutDialog.h
index 7ca0b35..6381ffb 100644
--- a/ChewingPreferences/AboutDialog.h
+++ b/ChewingPreferences/AboutDialog.h
@@ -21,7 +21,7 @@
 #define CHEWING_ABOUT_DIALOG_H
 #pragma once
 
-#include <libIME\Dialog.h>
+#include "Dialog.h"
 
 namespace Chewing {
 
diff --git a/ChewingPreferences/CMakeLists.txt b/ChewingPreferences/CMakeLists.txt
index 3ed7573..594a341 100644
--- a/ChewingPreferences/CMakeLists.txt
+++ b/ChewingPreferences/CMakeLists.txt
@@ -15,13 +15,13 @@ add_executable(ChewingPreferences WIN32
     ${CMAKE_SOURCE_DIR}/libIME/Utils.h
     ${CMAKE_SOURCE_DIR}/libIME/Window.cpp
     ${CMAKE_SOURCE_DIR}/libIME/Window.h
-    ${CMAKE_SOURCE_DIR}/libIME/Dialog.cpp
-    ${CMAKE_SOURCE_DIR}/libIME/Dialog.h
-    ${CMAKE_SOURCE_DIR}/libIME/PropertyDialog.cpp
-    ${CMAKE_SOURCE_DIR}/libIME/PropertyDialog.h
-    ${CMAKE_SOURCE_DIR}/libIME/PropertyPage.cpp
-    ${CMAKE_SOURCE_DIR}/libIME/PropertyPage.h
     # Configuration dialog
+    ${PROJECT_SOURCE_DIR}/Dialog.cpp
+    ${PROJECT_SOURCE_DIR}/Dialog.h
+    ${PROJECT_SOURCE_DIR}/PropertyDialog.cpp
+    ${PROJECT_SOURCE_DIR}/PropertyDialog.h
+    ${PROJECT_SOURCE_DIR}/PropertyPage.cpp
+    ${PROJECT_SOURCE_DIR}/PropertyPage.h
     ${PROJECT_SOURCE_DIR}/TypingPropertyPage.cpp
     ${PROJECT_SOURCE_DIR}/TypingPropertyPage.h
     ${PROJECT_SOURCE_DIR}/UiPropertyPage.cpp
diff --git a/ChewingPreferences/ChewingPreferences.cpp b/ChewingPreferences/ChewingPreferences.cpp
index 22bfc44..fe10d13 100644
--- a/ChewingPreferences/ChewingPreferences.cpp
+++ b/ChewingPreferences/ChewingPreferences.cpp
@@ -17,15 +17,15 @@
 //	Boston, MA  02110-1301, USA.
 //
 
-#include <Windows.h>
-#include <libIME/Dialog.h>
-#include <libIME/PropertyDialog.h>
+#include <libIME/Windows.h>
 #include <libIME/WindowsVersion.h>
 #include <libIME/ComPtr.h>
 #include "TypingPropertyPage.h"
 #include "UiPropertyPage.h"
 #include "KeyboardPropertyPage.h"
 #include "SymbolsPropertyPage.h"
+#include "Dialog.h"
+#include "PropertyDialog.h"
 #include "AboutDialog.h"
 #include "resource.h"
 #include <CommCtrl.h>
diff --git a/libIME/Dialog.cpp b/ChewingPreferences/Dialog.cpp
similarity index 100%
rename from libIME/Dialog.cpp
rename to ChewingPreferences/Dialog.cpp
diff --git a/libIME/Dialog.h b/ChewingPreferences/Dialog.h
similarity index 100%
rename from libIME/Dialog.h
rename to ChewingPreferences/Dialog.h
diff --git a/ChewingPreferences/KeyboardPropertyPage.h b/ChewingPreferences/KeyboardPropertyPage.h
index d07564a..e902209 100644
--- a/ChewingPreferences/KeyboardPropertyPage.h
+++ b/ChewingPreferences/KeyboardPropertyPage.h
@@ -21,7 +21,7 @@
 #define CHEWING_KEYBOARD_PROPERTY_PAGE_H
 #pragma once
 
-#include <libIME/PropertyPage.h>
+#include "PropertyPage.h"
 #include <ChewingTextService/ChewingConfig.h>
 
 namespace Chewing {
diff --git a/libIME/PropertyDialog.cpp b/ChewingPreferences/PropertyDialog.cpp
similarity index 100%
rename from libIME/PropertyDialog.cpp
rename to ChewingPreferences/PropertyDialog.cpp
diff --git a/libIME/PropertyDialog.h b/ChewingPreferences/PropertyDialog.h
similarity index 100%
rename from libIME/PropertyDialog.h
rename to ChewingPreferences/PropertyDialog.h
diff --git a/libIME/PropertyPage.cpp b/ChewingPreferences/PropertyPage.cpp
similarity index 100%
rename from libIME/PropertyPage.cpp
rename to ChewingPreferences/PropertyPage.cpp
diff --git a/libIME/PropertyPage.h b/ChewingPreferences/PropertyPage.h
similarity index 100%
rename from libIME/PropertyPage.h
rename to ChewingPreferences/PropertyPage.h
diff --git a/ChewingPreferences/SymbolsPropertyPage.h b/ChewingPreferences/SymbolsPropertyPage.h
index 6d05d87..079a888 100644
--- a/ChewingPreferences/SymbolsPropertyPage.h
+++ b/ChewingPreferences/SymbolsPropertyPage.h
@@ -21,7 +21,7 @@
 #define CHEWING_SYMBOLS_PROPERTY_PAGE
 #pragma once
 
-#include <libIME/PropertyPage.h>
+#include "PropertyPage.h"
 #include <ChewingTextService/ChewingConfig.h>
 #include <string>
 
diff --git a/ChewingPreferences/TypingPropertyPage.h b/ChewingPreferences/TypingPropertyPage.h
index 8816cec..8575f2d 100644
--- a/ChewingPreferences/TypingPropertyPage.h
+++ b/ChewingPreferences/TypingPropertyPage.h
@@ -20,7 +20,7 @@
 #ifndef CHEWING_TYPING_PROPERTY_PAGE_H
 #define CHEWING_TYPING_PROPERTY_PAGE_H
 
-#include <libIME/PropertyPage.h>
+#include "PropertyPage.h"
 #include <ChewingTextService/ChewingConfig.h>
 
 namespace Chewing {
diff --git a/ChewingPreferences/UiPropertyPage.h b/ChewingPreferences/UiPropertyPage.h
index c0a79df..46fc835 100644
--- a/ChewingPreferences/UiPropertyPage.h
+++ b/ChewingPreferences/UiPropertyPage.h
@@ -21,7 +21,7 @@
 #define CHEWING_UI_PROPERTY_PAGE_H
 #pragma once
 
-#include <libIME/PropertyPage.h>
+#include "PropertyPage.h"
 #include <ChewingTextService/ChewingConfig.h>
 
 namespace Chewing {
diff --git a/libIME/CMakeLists.txt b/libIME/CMakeLists.txt
index 3bab80d..3252432 100644
--- a/libIME/CMakeLists.txt
+++ b/libIME/CMakeLists.txt
@@ -29,12 +29,6 @@ add_library(libIME_static STATIC
     ${PROJECT_SOURCE_DIR}/DrawUtils.cpp
     ${PROJECT_SOURCE_DIR}/Window.cpp
     ${PROJECT_SOURCE_DIR}/Window.h
-    # ${PROJECT_SOURCE_DIR}/Dialog.cpp
-    # ${PROJECT_SOURCE_DIR}/Dialog.h
-    # ${PROJECT_SOURCE_DIR}/PropertyDialog.cpp
-    # ${PROJECT_SOURCE_DIR}/PropertyDialog.h
-    # ${PROJECT_SOURCE_DIR}/PropertyPage.cpp
-    # ${PROJECT_SOURCE_DIR}/PropertyPage.h
     ${PROJECT_SOURCE_DIR}/ImeWindow.cpp
     ${PROJECT_SOURCE_DIR}/ImeWindow.h
     ${PROJECT_SOURCE_DIR}/MessageWindow.cpp