diff --git a/pkg/libcoap/0001-Add-RIOT-Makefile.patch b/pkg/libcoap/patches/0001-Add-RIOT-Makefile.patch
similarity index 100%
rename from pkg/libcoap/0001-Add-RIOT-Makefile.patch
rename to pkg/libcoap/patches/0001-Add-RIOT-Makefile.patch
diff --git a/pkg/libcoap/0002-Add-config.h.patch b/pkg/libcoap/patches/0002-Add-config.h.patch
similarity index 100%
rename from pkg/libcoap/0002-Add-config.h.patch
rename to pkg/libcoap/patches/0002-Add-config.h.patch
diff --git a/pkg/libcoap/0003-Remove-two-example-programs-in-root.patch b/pkg/libcoap/patches/0003-Remove-two-example-programs-in-root.patch
similarity index 100%
rename from pkg/libcoap/0003-Remove-two-example-programs-in-root.patch
rename to pkg/libcoap/patches/0003-Remove-two-example-programs-in-root.patch
diff --git a/pkg/libcoap/0004-Eliminate-some-compiler-warnings-and-errors.patch b/pkg/libcoap/patches/0004-Eliminate-some-compiler-warnings-and-errors.patch
similarity index 100%
rename from pkg/libcoap/0004-Eliminate-some-compiler-warnings-and-errors.patch
rename to pkg/libcoap/patches/0004-Eliminate-some-compiler-warnings-and-errors.patch
diff --git a/pkg/libcoap/0005-fix-old-style-function-declarations.patch b/pkg/libcoap/patches/0005-fix-old-style-function-declarations.patch
similarity index 100%
rename from pkg/libcoap/0005-fix-old-style-function-declarations.patch
rename to pkg/libcoap/patches/0005-fix-old-style-function-declarations.patch
diff --git a/pkg/libcoap/0006-debug-do-not-misuse-NDEBUG.patch b/pkg/libcoap/patches/0006-debug-do-not-misuse-NDEBUG.patch
similarity index 100%
rename from pkg/libcoap/0006-debug-do-not-misuse-NDEBUG.patch
rename to pkg/libcoap/patches/0006-debug-do-not-misuse-NDEBUG.patch
diff --git a/pkg/libcoap/0007-fix-option-parsing-with-debug-enabled.patch b/pkg/libcoap/patches/0007-fix-option-parsing-with-debug-enabled.patch
similarity index 100%
rename from pkg/libcoap/0007-fix-option-parsing-with-debug-enabled.patch
rename to pkg/libcoap/patches/0007-fix-option-parsing-with-debug-enabled.patch
diff --git a/pkg/libcoap/0008-fix-debug-out-in-PDU-parsing.patch b/pkg/libcoap/patches/0008-fix-debug-out-in-PDU-parsing.patch
similarity index 100%
rename from pkg/libcoap/0008-fix-debug-out-in-PDU-parsing.patch
rename to pkg/libcoap/patches/0008-fix-debug-out-in-PDU-parsing.patch
diff --git a/pkg/libcoap/0009-delete-unused-function-check_opt_size.patch b/pkg/libcoap/patches/0009-delete-unused-function-check_opt_size.patch
similarity index 100%
rename from pkg/libcoap/0009-delete-unused-function-check_opt_size.patch
rename to pkg/libcoap/patches/0009-delete-unused-function-check_opt_size.patch
diff --git a/pkg/micro-ecc/0001-Add-RIOT-Makefile.patch b/pkg/micro-ecc/patches/0001-Add-RIOT-Makefile.patch
similarity index 100%
rename from pkg/micro-ecc/0001-Add-RIOT-Makefile.patch
rename to pkg/micro-ecc/patches/0001-Add-RIOT-Makefile.patch
diff --git a/pkg/micro-ecc/0002-Include-RIOT-Hardware-RNG-interface.patch b/pkg/micro-ecc/patches/0002-Include-RIOT-Hardware-RNG-interface.patch
similarity index 100%
rename from pkg/micro-ecc/0002-Include-RIOT-Hardware-RNG-interface.patch
rename to pkg/micro-ecc/patches/0002-Include-RIOT-Hardware-RNG-interface.patch
diff --git a/pkg/micro-ecc/0003-Use-the-parameter-curve-instead-of-the-static-refere.patch b/pkg/micro-ecc/patches/0003-Use-the-parameter-curve-instead-of-the-static-refere.patch
similarity index 100%
rename from pkg/micro-ecc/0003-Use-the-parameter-curve-instead-of-the-static-refere.patch
rename to pkg/micro-ecc/patches/0003-Use-the-parameter-curve-instead-of-the-static-refere.patch
diff --git a/pkg/microcoap/0001-Remove-unneeded-.c-files.patch b/pkg/microcoap/patches/0001-Remove-unneeded-.c-files.patch
similarity index 100%
rename from pkg/microcoap/0001-Remove-unneeded-.c-files.patch
rename to pkg/microcoap/patches/0001-Remove-unneeded-.c-files.patch
diff --git a/pkg/microcoap/0002-Add-RIOT-Makefile.patch b/pkg/microcoap/patches/0002-Add-RIOT-Makefile.patch
similarity index 100%
rename from pkg/microcoap/0002-Add-RIOT-Makefile.patch
rename to pkg/microcoap/patches/0002-Add-RIOT-Makefile.patch
diff --git a/pkg/microcoap/0003-change-flag-from-DEBUG-to-MICROCOAP_DEBUG.patch b/pkg/microcoap/patches/0003-change-flag-from-DEBUG-to-MICROCOAP_DEBUG.patch
similarity index 100%
rename from pkg/microcoap/0003-change-flag-from-DEBUG-to-MICROCOAP_DEBUG.patch
rename to pkg/microcoap/patches/0003-change-flag-from-DEBUG-to-MICROCOAP_DEBUG.patch
diff --git a/pkg/microcoap/0004-increment_max_segments.patch b/pkg/microcoap/patches/0004-increment_max_segments.patch
similarity index 100%
rename from pkg/microcoap/0004-increment_max_segments.patch
rename to pkg/microcoap/patches/0004-increment_max_segments.patch
diff --git a/pkg/microcoap/0005-fix-uninitialized-variable.patch b/pkg/microcoap/patches/0005-fix-uninitialized-variable.patch
similarity index 100%
rename from pkg/microcoap/0005-fix-uninitialized-variable.patch
rename to pkg/microcoap/patches/0005-fix-uninitialized-variable.patch
diff --git a/pkg/oonf_api/0001-add-RIOT-support.patch b/pkg/oonf_api/patches/0001-add-RIOT-support.patch
similarity index 100%
rename from pkg/oonf_api/0001-add-RIOT-support.patch
rename to pkg/oonf_api/patches/0001-add-RIOT-support.patch
diff --git a/pkg/oonf_api/0002-port-tests-to-riot.patch b/pkg/oonf_api/patches/0002-port-tests-to-riot.patch
similarity index 100%
rename from pkg/oonf_api/0002-port-tests-to-riot.patch
rename to pkg/oonf_api/patches/0002-port-tests-to-riot.patch
diff --git a/pkg/oonf_api/0003-port-example-to-riot.patch b/pkg/oonf_api/patches/0003-port-example-to-riot.patch
similarity index 100%
rename from pkg/oonf_api/0003-port-example-to-riot.patch
rename to pkg/oonf_api/patches/0003-port-example-to-riot.patch
diff --git a/pkg/oonf_api/0004-fix-conflicting-types.patch b/pkg/oonf_api/patches/0004-fix-conflicting-types.patch
similarity index 100%
rename from pkg/oonf_api/0004-fix-conflicting-types.patch
rename to pkg/oonf_api/patches/0004-fix-conflicting-types.patch
diff --git a/pkg/oonf_api/0005-only-define-container_of-when-necessary.patch b/pkg/oonf_api/patches/0005-only-define-container_of-when-necessary.patch
similarity index 100%
rename from pkg/oonf_api/0005-only-define-container_of-when-necessary.patch
rename to pkg/oonf_api/patches/0005-only-define-container_of-when-necessary.patch
diff --git a/pkg/oonf_api/0006-if_index-is-not-used.patch b/pkg/oonf_api/patches/0006-if_index-is-not-used.patch
similarity index 100%
rename from pkg/oonf_api/0006-if_index-is-not-used.patch
rename to pkg/oonf_api/patches/0006-if_index-is-not-used.patch
diff --git a/pkg/oonf_api/0007-Use-RIOT-s-container_of-implementation.patch b/pkg/oonf_api/patches/0007-Use-RIOT-s-container_of-implementation.patch
similarity index 100%
rename from pkg/oonf_api/0007-Use-RIOT-s-container_of-implementation.patch
rename to pkg/oonf_api/patches/0007-Use-RIOT-s-container_of-implementation.patch
diff --git a/pkg/oonf_api/0008-Dissolve-enum-into-single-defines.patch b/pkg/oonf_api/patches/0008-Dissolve-enum-into-single-defines.patch
similarity index 100%
rename from pkg/oonf_api/0008-Dissolve-enum-into-single-defines.patch
rename to pkg/oonf_api/patches/0008-Dissolve-enum-into-single-defines.patch
diff --git a/pkg/oonf_api/0009-Add-missing-include.patch b/pkg/oonf_api/patches/0009-Add-missing-include.patch
similarity index 100%
rename from pkg/oonf_api/0009-Add-missing-include.patch
rename to pkg/oonf_api/patches/0009-Add-missing-include.patch
diff --git a/pkg/oonf_api/0010-Change-index-of-array-from-0-to-1.patch b/pkg/oonf_api/patches/0010-Change-index-of-array-from-0-to-1.patch
similarity index 100%
rename from pkg/oonf_api/0010-Change-index-of-array-from-0-to-1.patch
rename to pkg/oonf_api/patches/0010-Change-index-of-array-from-0-to-1.patch
diff --git a/pkg/oonf_api/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch b/pkg/oonf_api/patches/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch
similarity index 100%
rename from pkg/oonf_api/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch
rename to pkg/oonf_api/patches/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch
diff --git a/pkg/openwsn/0001-Add-RIOT-Makefiles.patch b/pkg/openwsn/patches/0001-Add-RIOT-Makefiles.patch
similarity index 100%
rename from pkg/openwsn/0001-Add-RIOT-Makefiles.patch
rename to pkg/openwsn/patches/0001-Add-RIOT-Makefiles.patch
diff --git a/pkg/openwsn/0002-Add-RIOT-adaption.patch b/pkg/openwsn/patches/0002-Add-RIOT-adaption.patch
similarity index 100%
rename from pkg/openwsn/0002-Add-RIOT-adaption.patch
rename to pkg/openwsn/patches/0002-Add-RIOT-adaption.patch
diff --git a/pkg/openwsn/0003-Fix-old-style-definitions.patch b/pkg/openwsn/patches/0003-Fix-old-style-definitions.patch
similarity index 100%
rename from pkg/openwsn/0003-Fix-old-style-definitions.patch
rename to pkg/openwsn/patches/0003-Fix-old-style-definitions.patch
diff --git a/pkg/openwsn/0004-provide-openserial-dummies.patch b/pkg/openwsn/patches/0004-provide-openserial-dummies.patch
similarity index 100%
rename from pkg/openwsn/0004-provide-openserial-dummies.patch
rename to pkg/openwsn/patches/0004-provide-openserial-dummies.patch
diff --git a/pkg/openwsn/0005-fixes-to-RIOT-adaption.patch b/pkg/openwsn/patches/0005-fixes-to-RIOT-adaption.patch
similarity index 100%
rename from pkg/openwsn/0005-fixes-to-RIOT-adaption.patch
rename to pkg/openwsn/patches/0005-fixes-to-RIOT-adaption.patch
diff --git a/pkg/relic/0001-fixed-signedness-of-counter-variable.patch b/pkg/relic/patches/0001-fixed-signedness-of-counter-variable.patch
similarity index 100%
rename from pkg/relic/0001-fixed-signedness-of-counter-variable.patch
rename to pkg/relic/patches/0001-fixed-signedness-of-counter-variable.patch
diff --git a/pkg/relic/0002-don-t-redefine-ALIGN.patch b/pkg/relic/patches/0002-don-t-redefine-ALIGN.patch
similarity index 100%
rename from pkg/relic/0002-don-t-redefine-ALIGN.patch
rename to pkg/relic/patches/0002-don-t-redefine-ALIGN.patch
diff --git a/pkg/relic/0003-require-only-CMake-version-2.8.patch b/pkg/relic/patches/0003-require-only-CMake-version-2.8.patch
similarity index 100%
rename from pkg/relic/0003-require-only-CMake-version-2.8.patch
rename to pkg/relic/patches/0003-require-only-CMake-version-2.8.patch
diff --git a/pkg/wakaama/0001-changing-header-location.patch b/pkg/wakaama/patches/0001-changing-header-location.patch
similarity index 100%
rename from pkg/wakaama/0001-changing-header-location.patch
rename to pkg/wakaama/patches/0001-changing-header-location.patch
diff --git a/pkg/wakaama/0002-defined-endianness.patch b/pkg/wakaama/patches/0002-defined-endianness.patch
similarity index 100%
rename from pkg/wakaama/0002-defined-endianness.patch
rename to pkg/wakaama/patches/0002-defined-endianness.patch
diff --git a/pkg/wakaama/0003-fixed-warnings-in-er-coap-13.c.patch b/pkg/wakaama/patches/0003-fixed-warnings-in-er-coap-13.c.patch
similarity index 100%
rename from pkg/wakaama/0003-fixed-warnings-in-er-coap-13.c.patch
rename to pkg/wakaama/patches/0003-fixed-warnings-in-er-coap-13.c.patch
diff --git a/pkg/wakaama/0004-fixed-warnings-in-packet.c.patch b/pkg/wakaama/patches/0004-fixed-warnings-in-packet.c.patch
similarity index 100%
rename from pkg/wakaama/0004-fixed-warnings-in-packet.c.patch
rename to pkg/wakaama/patches/0004-fixed-warnings-in-packet.c.patch
diff --git a/pkg/wakaama/0005-fixed-warnings-in-tlv.c.patch b/pkg/wakaama/patches/0005-fixed-warnings-in-tlv.c.patch
similarity index 100%
rename from pkg/wakaama/0005-fixed-warnings-in-tlv.c.patch
rename to pkg/wakaama/patches/0005-fixed-warnings-in-tlv.c.patch
diff --git a/pkg/wakaama/0006-fixed-warnings-in-utils.c.patch b/pkg/wakaama/patches/0006-fixed-warnings-in-utils.c.patch
similarity index 100%
rename from pkg/wakaama/0006-fixed-warnings-in-utils.c.patch
rename to pkg/wakaama/patches/0006-fixed-warnings-in-utils.c.patch
diff --git a/pkg/wakaama/0007-fixed-warnings-in-bootstrap.c.patch b/pkg/wakaama/patches/0007-fixed-warnings-in-bootstrap.c.patch
similarity index 100%
rename from pkg/wakaama/0007-fixed-warnings-in-bootstrap.c.patch
rename to pkg/wakaama/patches/0007-fixed-warnings-in-bootstrap.c.patch
diff --git a/pkg/wakaama/0008-fixed-warnings-in-objects.c.patch b/pkg/wakaama/patches/0008-fixed-warnings-in-objects.c.patch
similarity index 100%
rename from pkg/wakaama/0008-fixed-warnings-in-objects.c.patch
rename to pkg/wakaama/patches/0008-fixed-warnings-in-objects.c.patch
diff --git a/pkg/wakaama/0009-fixed-errors-in-internals.h.patch b/pkg/wakaama/patches/0009-fixed-errors-in-internals.h.patch
similarity index 100%
rename from pkg/wakaama/0009-fixed-errors-in-internals.h.patch
rename to pkg/wakaama/patches/0009-fixed-errors-in-internals.h.patch
diff --git a/pkg/wakaama/0010-fixed-warnings-in-registration.c.patch b/pkg/wakaama/patches/0010-fixed-warnings-in-registration.c.patch
similarity index 100%
rename from pkg/wakaama/0010-fixed-warnings-in-registration.c.patch
rename to pkg/wakaama/patches/0010-fixed-warnings-in-registration.c.patch