diff --git a/groups.d/251.native_packages_lib.d/libidn.package b/groups.d/251.native_packages_lib.d/libidn.package
index dcfddf7..6cf084e 100644
--- a/groups.d/251.native_packages_lib.d/libidn.package
+++ b/groups.d/251.native_packages_lib.d/libidn.package
@@ -3,10 +3,6 @@
 : ${PKG_LIBIDN_VERSION:=1.42};
 : ${PKG_LIBIDN_URL:=https://ftp.gnu.org/gnu/libidn/libidn-${PKG_LIBIDN_VERSION}.tar.gz};
 : ${PKG_LIBIDN_CONFIGURE_ARGS_EXTRA:="--disable-java --disable-csharp --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf"};
-: ${PKG_LIBIDN2_DEPENDS:="libunistring libiconv"};
-: ${PKG_LIBIDN2_SHA256SUM:=93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f};
-: ${PKG_LIBIDN2_VERSION:=2.3.4};
-: ${PKG_LIBIDN2_URL:=https://ftp.gnu.org/gnu/libidn/libidn2-${PKG_LIBIDN2_VERSION}.tar.gz};
 
 ex_pkg_register "libidn" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
 
diff --git a/groups.d/251.native_packages_lib.d/libidn2.package b/groups.d/251.native_packages_lib.d/libidn2.package
new file mode 100644
index 0000000..e17f841
--- /dev/null
+++ b/groups.d/251.native_packages_lib.d/libidn2.package
@@ -0,0 +1,8 @@
+: ${PKG_LIBIDN2_DEPENDS:="libunistring libiconv"};
+: ${PKG_LIBIDN2_SHA256SUM:=93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f};
+: ${PKG_LIBIDN2_VERSION:=2.3.4};
+: ${PKG_LIBIDN2_URL:=https://ftp.gnu.org/gnu/libidn/libidn2-${PKG_LIBIDN2_VERSION}.tar.gz};
+
+ex_pkg_register "libidn2" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
+
+# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/Xrender.package b/groups.d/261.native_packages_x11.d/Xrender.package
new file mode 100644
index 0000000..6ed2785
--- /dev/null
+++ b/groups.d/261.native_packages_x11.d/Xrender.package
@@ -0,0 +1,8 @@
+: ${PKG_XRENDER_DEPENDS:="libX11 xorgproto"};
+: ${PKG_XRENDER_SHA256SUM:=c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949};
+: ${PKG_XRENDER_VERSION:=0.9.10};
+: ${PKG_XRENDER_URL:=https://www.x.org/releases/individual/lib/libXrender-${PKG_XRENDER_VERSION}.tar.bz2};
+
+ex_pkg_register "Xrender" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
+
+# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/freetype.package b/groups.d/261.native_packages_x11.d/freetype.package
index e826bf3..4f42ad0 100644
--- a/groups.d/261.native_packages_x11.d/freetype.package
+++ b/groups.d/261.native_packages_x11.d/freetype.package
@@ -3,12 +3,6 @@
 : ${PKG_FREETYPE_VERSION:=2.11.1};
 : ${PKG_FREETYPE_URL:=http://download.savannah.gnu.org/releases/freetype/freetype-${PKG_FREETYPE_VERSION}.tar.xz};
 : ${PKG_FREETYPE_CONFIGURE_ARGS_EXTRA:="--with-bzip2=yes --with-harfbuzz=yes --with-png=yes --with-zlib=yes"};
-: ${PKG_FREETYPE_PRE_DEPENDS:="bzip2 libpng libz"};
-: ${PKG_FREETYPE_PRE_SHA256SUM:=3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8};
-: ${PKG_FREETYPE_PRE_VERSION:=2.11.1};
-: ${PKG_FREETYPE_PRE_URL:=http://download.savannah.gnu.org/releases/freetype/freetype-${PKG_FREETYPE_PRE_VERSION}.tar.xz};
-: ${PKG_FREETYPE_PRE_CONFIGURE_ARGS_EXTRA:="--with-bzip2=yes --with-harfbuzz=no --with-png=yes --with-zlib=yes"};
-: ${PKG_FREETYPE_PRE_RPM_DISABLE:=1};
 
 ex_pkg_register "freetype" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
 
diff --git a/groups.d/261.native_packages_x11.d/freetype_pre.package b/groups.d/261.native_packages_x11.d/freetype_pre.package
new file mode 100644
index 0000000..8c65055
--- /dev/null
+++ b/groups.d/261.native_packages_x11.d/freetype_pre.package
@@ -0,0 +1,10 @@
+: ${PKG_FREETYPE_PRE_DEPENDS:="bzip2 libpng libz"};
+: ${PKG_FREETYPE_PRE_SHA256SUM:=3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8};
+: ${PKG_FREETYPE_PRE_VERSION:=2.11.1};
+: ${PKG_FREETYPE_PRE_URL:=http://download.savannah.gnu.org/releases/freetype/freetype-${PKG_FREETYPE_PRE_VERSION}.tar.xz};
+: ${PKG_FREETYPE_PRE_CONFIGURE_ARGS_EXTRA:="--with-bzip2=yes --with-harfbuzz=no --with-png=yes --with-zlib=yes"};
+: ${PKG_FREETYPE_PRE_RPM_DISABLE:=1};
+
+ex_pkg_register "freetype_pre" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
+
+# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/libICE.package b/groups.d/261.native_packages_x11.d/libICE.package
new file mode 100644
index 0000000..fd17e50
--- /dev/null
+++ b/groups.d/261.native_packages_x11.d/libICE.package
@@ -0,0 +1,9 @@
+: ${PKG_LIBICE_DEPENDS:="xorgproto xtrans"};
+: ${PKG_LIBICE_SHA256SUM:=03e77afaf72942c7ac02ccebb19034e6e20f456dcf8dddadfeb572aa5ad3e451};
+: ${PKG_LIBICE_VERSION:=1.1.1};
+: ${PKG_LIBICE_URL:=https://www.x.org/releases/individual/lib/libICE-${PKG_LIBICE_VERSION}.tar.xz};
+: ${PKG_LIBICE_CONFIGURE_ARGS_EXTRA:="--disable-unix-transport"};
+
+ex_pkg_register "libICE" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
+
+# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/libSM.package b/groups.d/261.native_packages_x11.d/libSM.package
new file mode 100644
index 0000000..9b16489
--- /dev/null
+++ b/groups.d/261.native_packages_x11.d/libSM.package
@@ -0,0 +1,9 @@
+: ${PKG_LIBSM_DEPENDS:="libICE xtrans"};
+: ${PKG_LIBSM_SHA256SUM:=fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84};
+: ${PKG_LIBSM_VERSION:=1.2.4};
+: ${PKG_LIBSM_URL:=https://www.x.org/releases/individual/lib/libSM-${PKG_LIBSM_VERSION}.tar.xz};
+: ${PKG_LIBSM_CONFIGURE_ARGS_EXTRA:="--disable-unix-transport"};
+
+ex_pkg_register "libSM" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
+
+# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/libice.package b/groups.d/261.native_packages_x11.d/libice.package
deleted file mode 100644
index 75e5484..0000000
--- a/groups.d/261.native_packages_x11.d/libice.package
+++ /dev/null
@@ -1,9 +0,0 @@
-: ${PKG_LIBICE_DEPENDS:="xorgproto xtrans"};
-: ${PKG_LIBICE_SHA256SUM:=03e77afaf72942c7ac02ccebb19034e6e20f456dcf8dddadfeb572aa5ad3e451};
-: ${PKG_LIBICE_VERSION:=1.1.1};
-: ${PKG_LIBICE_URL:=https://www.x.org/releases/individual/lib/libICE-${PKG_LIBICE_VERSION}.tar.xz};
-: ${PKG_LIBICE_CONFIGURE_ARGS_EXTRA:="--disable-unix-transport"};
-
-ex_pkg_register "libice" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
-
-# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/libsm.package b/groups.d/261.native_packages_x11.d/libsm.package
deleted file mode 100644
index 269eb51..0000000
--- a/groups.d/261.native_packages_x11.d/libsm.package
+++ /dev/null
@@ -1,9 +0,0 @@
-: ${PKG_LIBSM_DEPENDS:="libICE xtrans"};
-: ${PKG_LIBSM_SHA256SUM:=fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84};
-: ${PKG_LIBSM_VERSION:=1.2.4};
-: ${PKG_LIBSM_URL:=https://www.x.org/releases/individual/lib/libSM-${PKG_LIBSM_VERSION}.tar.xz};
-: ${PKG_LIBSM_CONFIGURE_ARGS_EXTRA:="--disable-unix-transport"};
-
-ex_pkg_register "libsm" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
-
-# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/xcb.package b/groups.d/261.native_packages_x11.d/xcb.package
index 4feb38f..0e166da 100644
--- a/groups.d/261.native_packages_x11.d/xcb.package
+++ b/groups.d/261.native_packages_x11.d/xcb.package
@@ -6,21 +6,6 @@
 : ${PKG_XCB_CONFIG_CACHE_EXTRA:="ac_cv_search_sendmsg=no"};
 : ${PKG_XCB_CONFIGURE_ARGS_EXTRA:="--disable-randr PYTHON=${PREFIX}/bin/python3"};
 : ${PKG_XCB_ENV_VARS_EXTRA:="XCBPROTO_XCBPYTHONDIR=${PREFIX_NATIVE}/lib/python2.7/site-packages:XCBPROTO_XCBINCLUDEDIR=${PREFIX_NATIVE}/share/xcb"};
-: ${PKG_XCB_PROTO_SHA256SUM:=a75a1848ad2a89a82d841a51be56ce988ff3c63a8d6bf4383ae3219d8d915119};
-: ${PKG_XCB_PROTO_VERSION:=1.16.0};
-: ${PKG_XCB_PROTO_URL:=https://www.x.org/releases/individual/proto/xcb-proto-${PKG_XCB_PROTO_VERSION}.tar.xz};
-: ${PKG_XCB_UTIL_DEPENDS:="xcb"};
-: ${PKG_XCB_UTIL_SHA256SUM:=5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512};
-: ${PKG_XCB_UTIL_VERSION:=0.4.1};
-: ${PKG_XCB_UTIL_URL:=https://x.org/releases/individual/xcb/xcb-util-${PKG_XCB_UTIL_VERSION}.tar.xz};
-: ${PKG_XCB_UTIL_IMAGE_DEPENDS:="xcb xcb_util"};
-: ${PKG_XCB_UTIL_IMAGE_SHA256SUM:=ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d};
-: ${PKG_XCB_UTIL_IMAGE_VERSION:=0.4.1};
-: ${PKG_XCB_UTIL_IMAGE_URL:=https://x.org/releases/individual/xcb/xcb-util-image-${PKG_XCB_UTIL_IMAGE_VERSION}.tar.xz};
-: ${PKG_XCB_UTIL_WM_DEPENDS:="xcb"};
-: ${PKG_XCB_UTIL_WM_SHA256SUM:=62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4f888a0b};
-: ${PKG_XCB_UTIL_WM_VERSION:=0.4.2};
-: ${PKG_XCB_UTIL_WM_URL:=https://x.org/releases/individual/xcb/xcb-util-wm-${PKG_XCB_UTIL_WM_VERSION}.tar.xz};
 
 ex_pkg_register "xcb" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
 
diff --git a/groups.d/261.native_packages_x11.d/xcb_proto.package b/groups.d/261.native_packages_x11.d/xcb_proto.package
new file mode 100644
index 0000000..8717d5b
--- /dev/null
+++ b/groups.d/261.native_packages_x11.d/xcb_proto.package
@@ -0,0 +1,7 @@
+: ${PKG_XCB_PROTO_SHA256SUM:=a75a1848ad2a89a82d841a51be56ce988ff3c63a8d6bf4383ae3219d8d915119};
+: ${PKG_XCB_PROTO_VERSION:=1.16.0};
+: ${PKG_XCB_PROTO_URL:=https://www.x.org/releases/individual/proto/xcb-proto-${PKG_XCB_PROTO_VERSION}.tar.xz};
+
+ex_pkg_register "xcb_proto" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
+
+# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/xcb_util.package b/groups.d/261.native_packages_x11.d/xcb_util.package
new file mode 100644
index 0000000..b16d0d7
--- /dev/null
+++ b/groups.d/261.native_packages_x11.d/xcb_util.package
@@ -0,0 +1,8 @@
+: ${PKG_XCB_UTIL_DEPENDS:="xcb"};
+: ${PKG_XCB_UTIL_SHA256SUM:=5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512};
+: ${PKG_XCB_UTIL_VERSION:=0.4.1};
+: ${PKG_XCB_UTIL_URL:=https://x.org/releases/individual/xcb/xcb-util-${PKG_XCB_UTIL_VERSION}.tar.xz};
+
+ex_pkg_register "xcb_util" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
+
+# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/xcb_util_image.package b/groups.d/261.native_packages_x11.d/xcb_util_image.package
new file mode 100644
index 0000000..83536d6
--- /dev/null
+++ b/groups.d/261.native_packages_x11.d/xcb_util_image.package
@@ -0,0 +1,8 @@
+: ${PKG_XCB_UTIL_IMAGE_DEPENDS:="xcb xcb_util"};
+: ${PKG_XCB_UTIL_IMAGE_SHA256SUM:=ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d};
+: ${PKG_XCB_UTIL_IMAGE_VERSION:=0.4.1};
+: ${PKG_XCB_UTIL_IMAGE_URL:=https://x.org/releases/individual/xcb/xcb-util-image-${PKG_XCB_UTIL_IMAGE_VERSION}.tar.xz};
+
+ex_pkg_register "xcb_util_image" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
+
+# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/xcb_util_wm.package b/groups.d/261.native_packages_x11.d/xcb_util_wm.package
new file mode 100644
index 0000000..b2c9aec
--- /dev/null
+++ b/groups.d/261.native_packages_x11.d/xcb_util_wm.package
@@ -0,0 +1,8 @@
+: ${PKG_XCB_UTIL_WM_DEPENDS:="xcb"};
+: ${PKG_XCB_UTIL_WM_SHA256SUM:=62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4f888a0b};
+: ${PKG_XCB_UTIL_WM_VERSION:=0.4.2};
+: ${PKG_XCB_UTIL_WM_URL:=https://x.org/releases/individual/xcb/xcb-util-wm-${PKG_XCB_UTIL_WM_VERSION}.tar.xz};
+
+ex_pkg_register "xcb_util_wm" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
+
+# vim:filetype=sh textwidth=0
diff --git a/groups.d/261.native_packages_x11.d/xrender.package b/groups.d/261.native_packages_x11.d/xrender.package
deleted file mode 100644
index 585d601..0000000
--- a/groups.d/261.native_packages_x11.d/xrender.package
+++ /dev/null
@@ -1,8 +0,0 @@
-: ${PKG_XRENDER_DEPENDS:="libX11 xorgproto"};
-: ${PKG_XRENDER_SHA256SUM:=c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949};
-: ${PKG_XRENDER_VERSION:=0.9.10};
-: ${PKG_XRENDER_URL:=https://www.x.org/releases/individual/lib/libXrender-${PKG_XRENDER_VERSION}.tar.bz2};
-
-ex_pkg_register "xrender" "${RTL_FILEOP_SOURCE_FNAME}" "native_packages";
-
-# vim:filetype=sh textwidth=0