diff --git a/WeChatTweak.xcodeproj/project.pbxproj b/WeChatTweak.xcodeproj/project.pbxproj
index 48c155c..1a993dc 100644
--- a/WeChatTweak.xcodeproj/project.pbxproj
+++ b/WeChatTweak.xcodeproj/project.pbxproj
@@ -87,7 +87,7 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		7D14E5A11F6447B900D75132 /* Manager */ = {
+		7D5AAF3320DF4B7B00860EEE /* Manager */ = {
 			isa = PBXGroup;
 			children = (
 				7D14E5A21F6447DB00D75132 /* AlfredManager.h */,
@@ -95,16 +95,46 @@
 				7DB8AFBC206211D900E683AE /* WTConfigManager.h */,
 				7DB8AFBD206211D900E683AE /* WTConfigManager.m */,
 			);
-			name = Manager;
+			path = Manager;
 			sourceTree = "<group>";
 		};
-		7D9049F21F82A3F5004E6370 /* Vendor */ = {
+		7D5AAF3520DF4B9700860EEE /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				7D9049F31F82A415004E6370 /* fishhook.c */,
-				7D9049F41F82A415004E6370 /* fishhook.h */,
+				7DF8424F1F4058C600D42D79 /* TweakPreferecesController.h */,
+				7DF842501F4058C600D42D79 /* TweakPreferecesController.m */,
+				7DF842511F4058C600D42D79 /* TweakPreferecesController.xib */,
 			);
-			name = Vendor;
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		7D5AAF3620DF4BA400860EEE /* Category */ = {
+			isa = PBXGroup;
+			children = (
+				7DF842571F4058DD00D42D79 /* NSBundle+WeChatTweak.h */,
+				7DF842581F4058DD00D42D79 /* NSBundle+WeChatTweak.m */,
+				7D9049F71F82B6FB004E6370 /* NSString+WeChatTweak.h */,
+				7D9049F81F82B6FB004E6370 /* NSString+WeChatTweak.m */,
+			);
+			path = Category;
+			sourceTree = "<group>";
+		};
+		7D5AAF3720DF4BB300860EEE /* Vendor */ = {
+			isa = PBXGroup;
+			children = (
+				7D9049F41F82A415004E6370 /* fishhook.h */,
+				7D9049F31F82A415004E6370 /* fishhook.c */,
+			);
+			path = Vendor;
+			sourceTree = "<group>";
+		};
+		7D5AAF3820DF4BC400860EEE /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				7DF8425F1F40590500D42D79 /* WeChatTweakHeaders.h */,
+				7DF8422B1F40583F00D42D79 /* Info.plist */,
+			);
+			path = "Supporting Files";
 			sourceTree = "<group>";
 		};
 		7DF8421D1F40583F00D42D79 = {
@@ -130,46 +160,16 @@
 			children = (
 				7DF8422A1F40583F00D42D79 /* WeChatTweak.h */,
 				7DF842331F4058AB00D42D79 /* WeChatTweak.m */,
-				7D14E5A11F6447B900D75132 /* Manager */,
-				7DF842551F4058C900D42D79 /* Controller */,
-				7DF842561F4058D300D42D79 /* Category */,
-				7D9049F21F82A3F5004E6370 /* Vendor */,
+				7D5AAF3720DF4BB300860EEE /* Vendor */,
+				7D5AAF3620DF4BA400860EEE /* Category */,
+				7D5AAF3520DF4B9700860EEE /* Controller */,
+				7D5AAF3320DF4B7B00860EEE /* Manager */,
 				7DF842631F40594400D42D79 /* Resources */,
-				7DF842321F40584700D42D79 /* Supporting Files */,
+				7D5AAF3820DF4BC400860EEE /* Supporting Files */,
 			);
 			path = WeChatTweak;
 			sourceTree = "<group>";
 		};
-		7DF842321F40584700D42D79 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				7DF8425F1F40590500D42D79 /* WeChatTweakHeaders.h */,
-				7DF8422B1F40583F00D42D79 /* Info.plist */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		7DF842551F4058C900D42D79 /* Controller */ = {
-			isa = PBXGroup;
-			children = (
-				7DF8424F1F4058C600D42D79 /* TweakPreferecesController.h */,
-				7DF842501F4058C600D42D79 /* TweakPreferecesController.m */,
-				7DF842511F4058C600D42D79 /* TweakPreferecesController.xib */,
-			);
-			name = Controller;
-			sourceTree = "<group>";
-		};
-		7DF842561F4058D300D42D79 /* Category */ = {
-			isa = PBXGroup;
-			children = (
-				7DF842571F4058DD00D42D79 /* NSBundle+WeChatTweak.h */,
-				7DF842581F4058DD00D42D79 /* NSBundle+WeChatTweak.m */,
-				7D9049F71F82B6FB004E6370 /* NSString+WeChatTweak.h */,
-				7D9049F81F82B6FB004E6370 /* NSString+WeChatTweak.m */,
-			);
-			name = Category;
-			sourceTree = "<group>";
-		};
 		7DF842631F40594400D42D79 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
@@ -234,7 +234,7 @@
 		7DF8421E1F40583F00D42D79 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = Sunnyyoung;
 				TargetAttributes = {
 					7DF842261F40583F00D42D79 = {
@@ -325,6 +325,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -332,6 +333,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -382,6 +384,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -389,6 +392,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -429,7 +433,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = WeChatTweak/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/WeChatTweak/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -450,7 +454,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = WeChatTweak/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/WeChatTweak/Supporting Files/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
diff --git a/WeChatTweak/NSBundle+WeChatTweak.h b/WeChatTweak/Category/NSBundle+WeChatTweak.h
similarity index 100%
rename from WeChatTweak/NSBundle+WeChatTweak.h
rename to WeChatTweak/Category/NSBundle+WeChatTweak.h
diff --git a/WeChatTweak/NSBundle+WeChatTweak.m b/WeChatTweak/Category/NSBundle+WeChatTweak.m
similarity index 100%
rename from WeChatTweak/NSBundle+WeChatTweak.m
rename to WeChatTweak/Category/NSBundle+WeChatTweak.m
diff --git a/WeChatTweak/NSString+WeChatTweak.h b/WeChatTweak/Category/NSString+WeChatTweak.h
similarity index 100%
rename from WeChatTweak/NSString+WeChatTweak.h
rename to WeChatTweak/Category/NSString+WeChatTweak.h
diff --git a/WeChatTweak/NSString+WeChatTweak.m b/WeChatTweak/Category/NSString+WeChatTweak.m
similarity index 100%
rename from WeChatTweak/NSString+WeChatTweak.m
rename to WeChatTweak/Category/NSString+WeChatTweak.m
diff --git a/WeChatTweak/TweakPreferecesController.h b/WeChatTweak/Controller/TweakPreferecesController.h
similarity index 100%
rename from WeChatTweak/TweakPreferecesController.h
rename to WeChatTweak/Controller/TweakPreferecesController.h
diff --git a/WeChatTweak/TweakPreferecesController.m b/WeChatTweak/Controller/TweakPreferecesController.m
similarity index 100%
rename from WeChatTweak/TweakPreferecesController.m
rename to WeChatTweak/Controller/TweakPreferecesController.m
diff --git a/WeChatTweak/TweakPreferecesController.xib b/WeChatTweak/Controller/TweakPreferecesController.xib
similarity index 100%
rename from WeChatTweak/TweakPreferecesController.xib
rename to WeChatTweak/Controller/TweakPreferecesController.xib
diff --git a/WeChatTweak/AlfredManager.h b/WeChatTweak/Manager/AlfredManager.h
similarity index 100%
rename from WeChatTweak/AlfredManager.h
rename to WeChatTweak/Manager/AlfredManager.h
diff --git a/WeChatTweak/AlfredManager.m b/WeChatTweak/Manager/AlfredManager.m
similarity index 100%
rename from WeChatTweak/AlfredManager.m
rename to WeChatTweak/Manager/AlfredManager.m
diff --git a/WeChatTweak/WTConfigManager.h b/WeChatTweak/Manager/WTConfigManager.h
similarity index 100%
rename from WeChatTweak/WTConfigManager.h
rename to WeChatTweak/Manager/WTConfigManager.h
diff --git a/WeChatTweak/WTConfigManager.m b/WeChatTweak/Manager/WTConfigManager.m
similarity index 100%
rename from WeChatTweak/WTConfigManager.m
rename to WeChatTweak/Manager/WTConfigManager.m
diff --git a/WeChatTweak/Info.plist b/WeChatTweak/Supporting Files/Info.plist
similarity index 100%
rename from WeChatTweak/Info.plist
rename to WeChatTweak/Supporting Files/Info.plist
diff --git a/WeChatTweak/WeChatTweakHeaders.h b/WeChatTweak/Supporting Files/WeChatTweakHeaders.h
similarity index 100%
rename from WeChatTweak/WeChatTweakHeaders.h
rename to WeChatTweak/Supporting Files/WeChatTweakHeaders.h
diff --git a/WeChatTweak/fishhook.c b/WeChatTweak/Vendor/fishhook.c
similarity index 100%
rename from WeChatTweak/fishhook.c
rename to WeChatTweak/Vendor/fishhook.c
diff --git a/WeChatTweak/fishhook.h b/WeChatTweak/Vendor/fishhook.h
similarity index 100%
rename from WeChatTweak/fishhook.h
rename to WeChatTweak/Vendor/fishhook.h