diff --git a/flake.nix b/flake.nix
index 2cad213..1fbeb54 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,8 +18,8 @@
       systems = lib.systems.flakeExposed;
       imports = [
         inputs.treefmt-nix.flakeModule
-        ./terraform/targets/flake-module.nix
-        ./nix/modules/flake-module.nix
+        ./targets/flake-module.nix
+        ./modules/flake-module.nix
       ];
       perSystem = { config, pkgs, ... }: {
         treefmt = {
diff --git a/nix/modules/flake-module.nix b/modules/flake-module.nix
similarity index 100%
rename from nix/modules/flake-module.nix
rename to modules/flake-module.nix
diff --git a/nix/modules/nixos-wiki.nix b/modules/nixos-wiki.nix
similarity index 100%
rename from nix/modules/nixos-wiki.nix
rename to modules/nixos-wiki.nix
diff --git a/terraform/targets/admins/apply.sh b/targets/admins/apply.sh
similarity index 100%
rename from terraform/targets/admins/apply.sh
rename to targets/admins/apply.sh
diff --git a/terraform/targets/admins/terraform.tf b/targets/admins/terraform.tf
similarity index 100%
rename from terraform/targets/admins/terraform.tf
rename to targets/admins/terraform.tf
diff --git a/terraform/targets/flake-module.nix b/targets/flake-module.nix
similarity index 100%
rename from terraform/targets/flake-module.nix
rename to targets/flake-module.nix
diff --git a/terraform/targets/nixos-wiki.thalheim.io/apply.sh b/targets/nixos-wiki.thalheim.io/apply.sh
similarity index 100%
rename from terraform/targets/nixos-wiki.thalheim.io/apply.sh
rename to targets/nixos-wiki.thalheim.io/apply.sh
diff --git a/terraform/targets/nixos-wiki.thalheim.io/configuration.nix b/targets/nixos-wiki.thalheim.io/configuration.nix
similarity index 100%
rename from terraform/targets/nixos-wiki.thalheim.io/configuration.nix
rename to targets/nixos-wiki.thalheim.io/configuration.nix
diff --git a/terraform/targets/nixos-wiki.thalheim.io/nixos-vars.json b/targets/nixos-wiki.thalheim.io/nixos-vars.json
similarity index 100%
rename from terraform/targets/nixos-wiki.thalheim.io/nixos-vars.json
rename to targets/nixos-wiki.thalheim.io/nixos-vars.json
diff --git a/terraform/targets/nixos-wiki.thalheim.io/terraform.tf b/targets/nixos-wiki.thalheim.io/terraform.tf
similarity index 93%
rename from terraform/targets/nixos-wiki.thalheim.io/terraform.tf
rename to targets/nixos-wiki.thalheim.io/terraform.tf
index 3bb44a5..cbfc547 100644
--- a/terraform/targets/nixos-wiki.thalheim.io/terraform.tf
+++ b/targets/nixos-wiki.thalheim.io/terraform.tf
@@ -10,7 +10,7 @@ terraform {
 }
 
 module "wiki" {
-  source           = "../../modules/wiki"
+  source           = "../../terraform/nixos-wiki"
   netlify_dns_zone = "nixos-wiki.thalheim.io"
   domain           = "nixos-wiki.thalheim.io"
   nixos_flake_attr = "nixos-wiki-production"
diff --git a/terraform/targets/staging.nixos-wiki.thalheim.io/apply.sh b/targets/staging.nixos-wiki.thalheim.io/apply.sh
similarity index 100%
rename from terraform/targets/staging.nixos-wiki.thalheim.io/apply.sh
rename to targets/staging.nixos-wiki.thalheim.io/apply.sh
diff --git a/terraform/targets/staging.nixos-wiki.thalheim.io/configuration.nix b/targets/staging.nixos-wiki.thalheim.io/configuration.nix
similarity index 100%
rename from terraform/targets/staging.nixos-wiki.thalheim.io/configuration.nix
rename to targets/staging.nixos-wiki.thalheim.io/configuration.nix
diff --git a/terraform/targets/staging.nixos-wiki.thalheim.io/terraform.tf b/targets/staging.nixos-wiki.thalheim.io/terraform.tf
similarity index 93%
rename from terraform/targets/staging.nixos-wiki.thalheim.io/terraform.tf
rename to targets/staging.nixos-wiki.thalheim.io/terraform.tf
index f811726..fecdc5c 100644
--- a/terraform/targets/staging.nixos-wiki.thalheim.io/terraform.tf
+++ b/targets/staging.nixos-wiki.thalheim.io/terraform.tf
@@ -10,7 +10,7 @@ terraform {
 }
 
 module "wiki" {
-  source           = "../../modules/wiki"
+  source           = "../../terraform/nixos-wiki"
   netlify_dns_zone = "nixos-wiki.thalheim.io"
   nixos_flake_attr = "nixos-wiki-staging"
   nixos_vars_file  = "${path.module}/nixos-vars.json"
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
deleted file mode 100644
index 34ae16c..0000000
--- a/terraform/.terraform.lock.hcl
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is maintained automatically by "terraform init".
-# Manual edits may be lost in future updates.
-
-provider "registry.terraform.io/aegirhealth/netlify" {
-  version = "0.6.12"
-  hashes = [
-    "h1:jorNWhgRCghXD0F6S7urDp1dPeczpFMTGttLeYAdbuo=",
-  ]
-}
-
-provider "registry.terraform.io/hetznercloud/hcloud" {
-  version = "1.38.2"
-  hashes = [
-    "h1:RVMJb7bPzN6xrsIpegNBpSlx8pnhowWV9mzsvPFPvRU=",
-  ]
-}
diff --git a/terraform/modules/admins/main.tf b/terraform/admins/main.tf
similarity index 100%
rename from terraform/modules/admins/main.tf
rename to terraform/admins/main.tf
diff --git a/terraform/modules/admins/providers.tf b/terraform/admins/providers.tf
similarity index 100%
rename from terraform/modules/admins/providers.tf
rename to terraform/admins/providers.tf
diff --git a/terraform/modules/admins/variables.tf b/terraform/admins/variables.tf
similarity index 100%
rename from terraform/modules/admins/variables.tf
rename to terraform/admins/variables.tf
diff --git a/terraform/modules/wiki/dns.tf b/terraform/wiki/dns.tf
similarity index 100%
rename from terraform/modules/wiki/dns.tf
rename to terraform/wiki/dns.tf
diff --git a/terraform/modules/wiki/main.tf b/terraform/wiki/main.tf
similarity index 100%
rename from terraform/modules/wiki/main.tf
rename to terraform/wiki/main.tf
diff --git a/terraform/modules/wiki/nixos_vars.tf b/terraform/wiki/nixos_vars.tf
similarity index 100%
rename from terraform/modules/wiki/nixos_vars.tf
rename to terraform/wiki/nixos_vars.tf
diff --git a/terraform/modules/wiki/providers.tf b/terraform/wiki/providers.tf
similarity index 100%
rename from terraform/modules/wiki/providers.tf
rename to terraform/wiki/providers.tf
diff --git a/terraform/modules/wiki/variables.tf b/terraform/wiki/variables.tf
similarity index 100%
rename from terraform/modules/wiki/variables.tf
rename to terraform/wiki/variables.tf