diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index dcaf6260f0c4..5c6a64b1f33d 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -1,14 +1,14 @@
 { callPackage, pkgs }:
 {
   #### CORE EFL
-  efl = callPackage ./efl.nix { };
+  efl = callPackage ./efl { };
 
   #### WINDOW MANAGER
-  enlightenment = callPackage ./enlightenment.nix { };
+  enlightenment = callPackage ./enlightenment { };
 
   #### APPLICATIONS
-  econnman = callPackage ./econnman.nix { };
-  terminology = callPackage ./terminology.nix { };
-  rage = callPackage ./rage.nix { };
-  ephoto = callPackage ./ephoto.nix { };
+  econnman = callPackage ./econnman { };
+  terminology = callPackage ./terminology { };
+  rage = callPackage ./rage { };
+  ephoto = callPackage ./ephoto { };
 }
diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman/default.nix
similarity index 100%
rename from pkgs/desktops/enlightenment/econnman.nix
rename to pkgs/desktops/enlightenment/econnman/default.nix
diff --git a/pkgs/desktops/enlightenment/0002-efreet-more-stat-info-changes.patch b/pkgs/desktops/enlightenment/efl/0002-efreet-more-stat-info-changes.patch
similarity index 100%
rename from pkgs/desktops/enlightenment/0002-efreet-more-stat-info-changes.patch
rename to pkgs/desktops/enlightenment/efl/0002-efreet-more-stat-info-changes.patch
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl/default.nix
similarity index 100%
rename from pkgs/desktops/enlightenment/efl.nix
rename to pkgs/desktops/enlightenment/efl/default.nix
diff --git a/pkgs/desktops/enlightenment/efl-elua.patch b/pkgs/desktops/enlightenment/efl/efl-elua.patch
similarity index 100%
rename from pkgs/desktops/enlightenment/efl-elua.patch
rename to pkgs/desktops/enlightenment/efl/efl-elua.patch
diff --git a/pkgs/desktops/enlightenment/0001-wrapped-setuid-executables.patch b/pkgs/desktops/enlightenment/enlightenment/0001-wrapped-setuid-executables.patch
similarity index 100%
rename from pkgs/desktops/enlightenment/0001-wrapped-setuid-executables.patch
rename to pkgs/desktops/enlightenment/enlightenment/0001-wrapped-setuid-executables.patch
diff --git a/pkgs/desktops/enlightenment/0003-setuid-missing-path.patch b/pkgs/desktops/enlightenment/enlightenment/0003-setuid-missing-path.patch
similarity index 100%
rename from pkgs/desktops/enlightenment/0003-setuid-missing-path.patch
rename to pkgs/desktops/enlightenment/enlightenment/0003-setuid-missing-path.patch
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix
similarity index 100%
rename from pkgs/desktops/enlightenment/enlightenment.nix
rename to pkgs/desktops/enlightenment/enlightenment/default.nix
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto/default.nix
similarity index 100%
rename from pkgs/desktops/enlightenment/ephoto.nix
rename to pkgs/desktops/enlightenment/ephoto/default.nix
diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage/default.nix
similarity index 100%
rename from pkgs/desktops/enlightenment/rage.nix
rename to pkgs/desktops/enlightenment/rage/default.nix
diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology/default.nix
similarity index 100%
rename from pkgs/desktops/enlightenment/terminology.nix
rename to pkgs/desktops/enlightenment/terminology/default.nix