diff --git a/flake.nix b/flake.nix
index a71e47a..d948e21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,9 @@
         test-runner = pkgs.callPackage ./run-tests.nix {};
       };
       defaultPackage = self.packages.${system}.default;
-      devShell = pkgs.callPackage ./shell.nix { };
+      devShells.default = pkgs.callPackage ./shell.nix { };
+      # FIXME backward compat, drop soon
+      devShell = self.devShells.default;
       apps.test-runner = {
         type = "app";
         program = "${self.packages.${system}.test-runner}";
@@ -21,9 +23,11 @@
       overlay = final: prev: {
         nix-direnv = final.callPackage ./default.nix { };
       };
-      defaultTemplate = {
-        path = ./template;
+      templates.default = {
+        path = ./templates/flake;
         description = "nix flake new -t github:Mic92/nix-direnv .";
       };
+      # FIXME backward compat, drop soon
+      defaultTemplate = self.templates.default;
     };
 }
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 6f93bec..e417d78 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -21,7 +21,7 @@ fi
 sed -i direnvrc \
     -e 's!\(declare major=\).*\( # UPDATE(nix-direnv version)\)!\1'"${ver[0]@Q} minor=${ver[1]@Q} patch=${ver[2]@Q}"'\2!'
 
-sed -i README.md template/.envrc \
+sed -i README.md templates/flake/.envrc \
     -e 's!\(nix-direnv/\).*\(/direnvrc\)!\1'"${version}"'\2!' \
     -e 's?\( ! nix_direnv_version \)[0-9.]\+\(; \)?\1'"${version}"'\2?'
 git add README.md direnvrc
diff --git a/scripts/update-checksum.sh b/scripts/update-checksum.sh
index 72a5d4e..aced453 100755
--- a/scripts/update-checksum.sh
+++ b/scripts/update-checksum.sh
@@ -7,7 +7,7 @@ cd "$SCRIPT_DIR/.."
 tag=$(curl --silent "https://api.github.com/repos/nix-community/nix-direnv/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
 sha256=$(direnv fetchurl "https://raw.githubusercontent.com/nix-community/nix-direnv/${tag}/direnvrc" | grep -m1 -o 'sha256-.*')
 
-sed -i README.md template/.envrc -e "s!sha256-.*!${sha256}\"!"
-git add README.md template/.envrc
+sed -i README.md templates/flake/.envrc -e "s!sha256-.*!${sha256}\"!"
+git add README.md templates/flake/.envrc
 git commit -m "update fetchurl checksum"
 #git push
diff --git a/template/.envrc b/templates/flake/.envrc
similarity index 100%
rename from template/.envrc
rename to templates/flake/.envrc
diff --git a/template/flake.nix b/templates/flake/flake.nix
similarity index 100%
rename from template/flake.nix
rename to templates/flake/flake.nix