diff --git a/pkgs/applications/video/xplayer/plparser.nix b/pkgs/by-name/li/libxplayer-plparser/package.nix
similarity index 100%
rename from pkgs/applications/video/xplayer/plparser.nix
rename to pkgs/by-name/li/libxplayer-plparser/package.nix
diff --git a/pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch b/pkgs/by-name/xe/xed-editor/correct-gir-lib-path.patch
similarity index 100%
rename from pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch
rename to pkgs/by-name/xe/xed-editor/correct-gir-lib-path.patch
diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/by-name/xe/xed-editor/package.nix
similarity index 100%
rename from pkgs/applications/editors/xed-editor/default.nix
rename to pkgs/by-name/xe/xed-editor/package.nix
diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/by-name/xp/xplayer/package.nix
similarity index 90%
rename from pkgs/applications/video/xplayer/default.nix
rename to pkgs/by-name/xp/xplayer/package.nix
index d697ff202004..3ceea76aa409 100644
--- a/pkgs/applications/video/xplayer/default.nix
+++ b/pkgs/by-name/xp/xplayer/package.nix
@@ -8,10 +8,7 @@
 , gettext
 , glib
 , gobject-introspection
-, gst-plugins-bad
-, gst-plugins-base
-, gst-plugins-good
-, gstreamer
+, gst_all_1
 , gtk-doc
 , gtk3
 , intltool
@@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
   # the gstreamer toolsdir points to the wrong derivation output
   postPatch = ''
     substituteInPlace configure.ac \
-                      --replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer}/bin/gst-inspect-1.0' \
+                      --replace '$gst10_toolsdir/gst-inspect-1.0' '${gst_all_1.gstreamer}/bin/gst-inspect-1.0' \
   '';
 
   preBuild = ''
@@ -68,10 +65,10 @@ stdenv.mkDerivation rec {
     clutter-gst
     clutter-gtk
     glib
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gstreamer
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gstreamer
     gtk3
     libpeas
     libxml2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccae64164e1f..a3959a193928 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35161,8 +35161,6 @@ with pkgs;
 
   xdotool = callPackage ../tools/X11/xdotool { };
 
-  xed-editor = callPackage ../applications/editors/xed-editor { };
-
   xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {});
 
   xen = xenPackages.xen-vanilla;
@@ -35259,12 +35257,6 @@ with pkgs;
   };
   libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
 
-
-  xplayer = callPackage ../applications/video/xplayer {
-    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad;
-  };
-  libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { };
-
   xrectsel = callPackage ../tools/X11/xrectsel { };
 
   xrestop = callPackage ../tools/X11/xrestop { };