diff --git a/patches/0001-ws2_32-Ask-the-server-to-process-unsupported-WSAIoct.patch b/patches/01-Address_Change_Notification/0001-ws2_32-Ask-the-server-to-process-unsupported-WSAIoct.patch
similarity index 100%
rename from patches/0001-ws2_32-Ask-the-server-to-process-unsupported-WSAIoct.patch
rename to patches/01-Address_Change_Notification/0001-ws2_32-Ask-the-server-to-process-unsupported-WSAIoct.patch
diff --git a/patches/0002-server-Implement-an-interface-change-notification-ob.patch b/patches/01-Address_Change_Notification/0002-server-Implement-an-interface-change-notification-ob.patch
similarity index 100%
rename from patches/0002-server-Implement-an-interface-change-notification-ob.patch
rename to patches/01-Address_Change_Notification/0002-server-Implement-an-interface-change-notification-ob.patch
diff --git a/patches/0003-ws2_32-Add-an-interactive-test-for-interface-change-.patch b/patches/01-Address_Change_Notification/0003-ws2_32-Add-an-interactive-test-for-interface-change-.patch
similarity index 100%
rename from patches/0003-ws2_32-Add-an-interactive-test-for-interface-change-.patch
rename to patches/01-Address_Change_Notification/0003-ws2_32-Add-an-interactive-test-for-interface-change-.patch
diff --git a/patches/0004-server-Store-and-return-security-attributes-with-ext.patch b/patches/02-ACL_Extended_Attributes/0001-server-Store-and-return-security-attributes-with-ext.patch
similarity index 100%
rename from patches/0004-server-Store-and-return-security-attributes-with-ext.patch
rename to patches/02-ACL_Extended_Attributes/0001-server-Store-and-return-security-attributes-with-ext.patch
diff --git a/patches/0005-ntdll-Inherit-security-attributes-from-parent-direct.patch b/patches/02-ACL_Extended_Attributes/0002-ntdll-Inherit-security-attributes-from-parent-direct.patch
similarity index 100%
rename from patches/0005-ntdll-Inherit-security-attributes-from-parent-direct.patch
rename to patches/02-ACL_Extended_Attributes/0002-ntdll-Inherit-security-attributes-from-parent-direct.patch
diff --git a/patches/0006-kernel32-Allow-string-comparison-with-linguistic-cas.patch b/patches/03-Linguistic_Casing/0001-kernel32-Allow-string-comparison-with-linguistic-cas.patch
similarity index 100%
rename from patches/0006-kernel32-Allow-string-comparison-with-linguistic-cas.patch
rename to patches/03-Linguistic_Casing/0001-kernel32-Allow-string-comparison-with-linguistic-cas.patch
diff --git a/patches/0008-winex11-Update-gl_drawable-for-embedded-windows.patch b/patches/04-XEMBED/0001-winex11-Update-gl_drawable-for-embedded-windows.patch
similarity index 100%
rename from patches/0008-winex11-Update-gl_drawable-for-embedded-windows.patch
rename to patches/04-XEMBED/0001-winex11-Update-gl_drawable-for-embedded-windows.patch
diff --git a/patches/0010-winex11-Enable-disable-windows-when-they-are-un-mapped.patch b/patches/04-XEMBED/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch
similarity index 100%
rename from patches/0010-winex11-Enable-disable-windows-when-they-are-un-mapped.patch
rename to patches/04-XEMBED/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch
diff --git a/patches/0009-kernel32-Change-return-value-of-stub-SetNamedPipeHandl.patch b/patches/05-Transact_Named_Pipe/0001-kernel32-Change-return-value-of-stub-SetNamedPipeHandl.patch
similarity index 100%
rename from patches/0009-kernel32-Change-return-value-of-stub-SetNamedPipeHandl.patch
rename to patches/05-Transact_Named_Pipe/0001-kernel32-Change-return-value-of-stub-SetNamedPipeHandl.patch
diff --git a/patches/0007-quartz-tests-Add-tests-for-IVMRMonitorConfig-and-IVMRM.patch b/patches/98-Miscellaneous/0001-quartz-tests-Add-tests-for-IVMRMonitorConfig-and-IVMRM.patch
similarity index 100%
rename from patches/0007-quartz-tests-Add-tests-for-IVMRMonitorConfig-and-IVMRM.patch
rename to patches/98-Miscellaneous/0001-quartz-tests-Add-tests-for-IVMRMonitorConfig-and-IVMRM.patch
diff --git a/patches/0011-quartz-Workaround-Silverlight-problems-when-multiple-m.patch b/patches/99-Workarounds/0001-quartz-Workaround-Silverlight-problems-when-multiple-m.patch
similarity index 100%
rename from patches/0011-quartz-Workaround-Silverlight-problems-when-multiple-m.patch
rename to patches/99-Workarounds/0001-quartz-Workaround-Silverlight-problems-when-multiple-m.patch