diff --git a/terraform/bpg-simple-vm/terraform.tfvars b/terraform/bpg-simple-vm/terraform.tfvars
deleted file mode 100644
index 05eb60c..0000000
--- a/terraform/bpg-simple-vm/terraform.tfvars
+++ /dev/null
@@ -1,5 +0,0 @@
-node_name = "zenith"
-vm_name   = "zenith-vm"
-vm_cpu    = 2
-vm_ram    = 2048
-vm_vlan   = 66
\ No newline at end of file
diff --git a/terraform/bpg-simple-vm/main.tf b/terraform/modules/pve_vm/main.tf
similarity index 100%
rename from terraform/bpg-simple-vm/main.tf
rename to terraform/modules/pve_vm/main.tf
diff --git a/terraform/bpg-simple-vm/provider.tf b/terraform/modules/pve_vm/provider.tf
similarity index 100%
rename from terraform/bpg-simple-vm/provider.tf
rename to terraform/modules/pve_vm/provider.tf
diff --git a/terraform/bpg-simple-vm/variables.tf b/terraform/modules/pve_vm/variables.tf
similarity index 100%
rename from terraform/bpg-simple-vm/variables.tf
rename to terraform/modules/pve_vm/variables.tf
diff --git a/terraform/projects/bpg-simple-vm/main.tf b/terraform/projects/bpg-simple-vm/main.tf
new file mode 100644
index 0000000..2e3de2a
--- /dev/null
+++ b/terraform/projects/bpg-simple-vm/main.tf
@@ -0,0 +1,14 @@
+module "pve_vm" {
+  source            = "../../modules/pve_vm"
+  proxmox_endpoint  = var.proxmox_endpoint
+  proxmox_api_token = var.proxmox_api_token
+  node_name         = "zenith"
+  vm_name           = "zenith-vm"
+  vm_cpu            = 2
+  vm_ram            = 2048
+  vm_vlan           = 66
+}
+
+output "vm_ip" {
+  value = module.pve_vm.vm_ip
+}
\ No newline at end of file
diff --git a/terraform/projects/bpg-simple-vm/variables.tf b/terraform/projects/bpg-simple-vm/variables.tf
new file mode 100644
index 0000000..010b9e5
--- /dev/null
+++ b/terraform/projects/bpg-simple-vm/variables.tf
@@ -0,0 +1,2 @@
+variable "proxmox_endpoint" {}
+variable "proxmox_api_token" {}
\ No newline at end of file
diff --git a/terraform/simple-cloudinit-vm/main.tf b/terraform/projects/simple-cloudinit-vm/main.tf
similarity index 100%
rename from terraform/simple-cloudinit-vm/main.tf
rename to terraform/projects/simple-cloudinit-vm/main.tf
diff --git a/terraform/simple-cloudinit-vm/provider.tf b/terraform/projects/simple-cloudinit-vm/provider.tf
similarity index 100%
rename from terraform/simple-cloudinit-vm/provider.tf
rename to terraform/projects/simple-cloudinit-vm/provider.tf
diff --git a/terraform/simple-cloudinit-vm/variables.tf b/terraform/projects/simple-cloudinit-vm/variables.tf
similarity index 100%
rename from terraform/simple-cloudinit-vm/variables.tf
rename to terraform/projects/simple-cloudinit-vm/variables.tf