diff --git a/00-provider.tf b/00-provider.tf
index 20c31ea..89d2eb6 100644
--- a/00-provider.tf
+++ b/00-provider.tf
@@ -17,7 +17,3 @@ provider "stackit" {
   service_account_key_path = var.service_account_key_path
   enable_beta_resources = true
 }
-
-module "project" {
-  source = "./project"
-}
diff --git a/01-network.tf b/01-network.tf
index 0210019..c344f5c 100644
--- a/01-network.tf
+++ b/01-network.tf
@@ -43,10 +43,10 @@ resource "stackit_network_interface" "p2_lan1" {
   network_id         = stackit_network.p2_lan_network1.network_id
   security           = false
   name              = "P2LAN1"
-  //security_group_ids = [ stackit_security_group.example.security_group_id ]
+  security_group_ids = [ stackit_security_group.example.security_group_id ]
 }
 
-/* this is for adding a second network interface to the core project (for WAN access).
+/* this is for adding a second network interface to the core project (for WAN access).*/
  resource "stackit_network" "p2_wan_network1" {
   project_id         = module.project.project_info["project2"].project_id
   name               = "wan"
@@ -60,7 +60,7 @@ resource "stackit_network_interface" "p2_wan_interface1" {
   security           = false
   name              = "wan_if"
 }
-*/
+/**/
 
 /* ---------- project 3 backup ------------------ */
 resource "stackit_network" "p3_lan_network1" {
@@ -125,7 +125,7 @@ resource "stackit_network_interface" "p6_lan1" {
   network_id         = stackit_network.p6_lan_network1.network_id
   security           = false
   name              = "P6LAN1"
-  //security_group_ids = [ stackit_security_group.example_beta.security_group_id ]
+  security_group_ids = [ stackit_security_group.example_beta.security_group_id ]
 }
 
 /* ---------- public IP configuration------------- */
@@ -138,19 +138,18 @@ resource "stackit_public_ip" "wan_ip_beta" {
   network_interface_id = stackit_network_interface.wan_beta.network_interface_id
 }
 
-*/ this is for adding a public IP to the second project (core) for WAN access.
+/* this is for adding a public IP to the second project (core) for WAN access. */
 resource "stackit_public_ip" "wan_server" {
   project_id           = module.project.project_info["project2"].project_id
   network_interface_id = stackit_network_interface.p2_wan_interface1.network_interface_id
 }
-*/
 
 /* Output the public IPs for both projects */
 output "public_ips" {
   value = {
     "pfsense-alpha"   = stackit_public_ip.wan_ip.ip
     "pfsense-beta" = stackit_public_ip.wan_ip_beta.ip
-    //"wan_server"   = stackit_public_ip.wan_server.ip
+    "wan_server"   = stackit_public_ip.wan_server.ip
   }
 }
 
diff --git a/80-keypair.tf b/80-keypair.tf
index 947a3fb..19b18a4 100644
--- a/80-keypair.tf
+++ b/80-keypair.tf
@@ -1,6 +1,6 @@
 // keypair adding to the server
 resource "stackit_key_pair" "keypair" {
   name       = "073a0ea0-9282-4ed6-8990-d5c4bff7cc3f"
-  public_key = chomp(file("/root/.ssh/id_ed25519.pub"))
+  public_key = chomp(file(var.public_key_file))
 }
 
diff --git a/modules.tf b/modules.tf
new file mode 100644
index 0000000..b7fecc9
--- /dev/null
+++ b/modules.tf
@@ -0,0 +1,3 @@
+module "project" {
+  source = "./modules/project"
+}
\ No newline at end of file
diff --git a/project/00-provider.tf b/modules/project/00-provider.tf
similarity index 100%
rename from project/00-provider.tf
rename to modules/project/00-provider.tf
diff --git a/project/01-sna.tf b/modules/project/01-sna.tf
similarity index 100%
rename from project/01-sna.tf
rename to modules/project/01-sna.tf
diff --git a/project/02-project.tf b/modules/project/02-project.tf
similarity index 100%
rename from project/02-project.tf
rename to modules/project/02-project.tf
diff --git a/project/99-variables.tf b/modules/project/99-variables.tf
similarity index 100%
rename from project/99-variables.tf
rename to modules/project/99-variables.tf