diff --git a/internal/app/warewulfd/warewulfd-reponses/ipxe.go b/internal/app/warewulfd/response/ipxe.go
similarity index 98%
rename from internal/app/warewulfd/warewulfd-reponses/ipxe.go
rename to internal/app/warewulfd/response/ipxe.go
index 6a4b44a5..76336e6b 100644
--- a/internal/app/warewulfd/warewulfd-reponses/ipxe.go
+++ b/internal/app/warewulfd/response/ipxe.go
@@ -1,4 +1,4 @@
-package warewulfd_responses
+package response
 
 import (
 	"fmt"
diff --git a/internal/app/warewulfd/warewulfd-reponses/kernel.go b/internal/app/warewulfd/response/kernel.go
similarity index 95%
rename from internal/app/warewulfd/warewulfd-reponses/kernel.go
rename to internal/app/warewulfd/response/kernel.go
index 018a9d8f..8613e9b1 100644
--- a/internal/app/warewulfd/warewulfd-reponses/kernel.go
+++ b/internal/app/warewulfd/response/kernel.go
@@ -1,4 +1,4 @@
-package warewulfd_responses
+package response
 
 import (
 	"github.com/hpcng/warewulf/internal/pkg/config"
diff --git a/internal/app/warewulfd/warewulfd-reponses/kmods.go b/internal/app/warewulfd/response/kmods.go
similarity index 95%
rename from internal/app/warewulfd/warewulfd-reponses/kmods.go
rename to internal/app/warewulfd/response/kmods.go
index dff142f1..90043190 100644
--- a/internal/app/warewulfd/warewulfd-reponses/kmods.go
+++ b/internal/app/warewulfd/response/kmods.go
@@ -1,4 +1,4 @@
-package warewulfd_responses
+package response
 
 import (
 	"github.com/hpcng/warewulf/internal/pkg/config"
diff --git a/internal/app/warewulfd/warewulfd-reponses/runtime.go b/internal/app/warewulfd/response/runtime.go
similarity index 98%
rename from internal/app/warewulfd/warewulfd-reponses/runtime.go
rename to internal/app/warewulfd/response/runtime.go
index b173ddc7..0b0a4ea7 100644
--- a/internal/app/warewulfd/warewulfd-reponses/runtime.go
+++ b/internal/app/warewulfd/response/runtime.go
@@ -1,4 +1,4 @@
-package warewulfd_responses
+package response
 
 import (
 	"fmt"
diff --git a/internal/app/warewulfd/warewulfd-reponses/system.go b/internal/app/warewulfd/response/system.go
similarity index 95%
rename from internal/app/warewulfd/warewulfd-reponses/system.go
rename to internal/app/warewulfd/response/system.go
index ffae0cf9..ae87fc25 100644
--- a/internal/app/warewulfd/warewulfd-reponses/system.go
+++ b/internal/app/warewulfd/response/system.go
@@ -1,4 +1,4 @@
-package warewulfd_responses
+package response
 
 import (
 	"github.com/hpcng/warewulf/internal/pkg/config"
diff --git a/internal/app/warewulfd/warewulfd-reponses/util.go b/internal/app/warewulfd/response/util.go
similarity index 97%
rename from internal/app/warewulfd/warewulfd-reponses/util.go
rename to internal/app/warewulfd/response/util.go
index 293a6f58..2eaad20a 100644
--- a/internal/app/warewulfd/warewulfd-reponses/util.go
+++ b/internal/app/warewulfd/response/util.go
@@ -1,4 +1,4 @@
-package warewulfd_responses
+package response
 
 import (
 	"github.com/hpcng/warewulf/internal/pkg/assets"
diff --git a/internal/app/warewulfd/warewulfd-reponses/vnfs.go b/internal/app/warewulfd/response/vnfs.go
similarity index 96%
rename from internal/app/warewulfd/warewulfd-reponses/vnfs.go
rename to internal/app/warewulfd/response/vnfs.go
index 1967b7ab..c6e03fdf 100644
--- a/internal/app/warewulfd/warewulfd-reponses/vnfs.go
+++ b/internal/app/warewulfd/response/vnfs.go
@@ -1,4 +1,4 @@
-package warewulfd_responses
+package response
 
 import (
 	"github.com/hpcng/warewulf/internal/pkg/config"
diff --git a/internal/app/warewulfd/warewulfd.go b/internal/app/warewulfd/warewulfd.go
index 57ec3281..dbdacebe 100644
--- a/internal/app/warewulfd/warewulfd.go
+++ b/internal/app/warewulfd/warewulfd.go
@@ -1,7 +1,7 @@
 package warewulfd
 
 import (
-	warewulfd_responses "github.com/hpcng/warewulf/internal/app/warewulfd/warewulfd-reponses"
+	"github.com/hpcng/warewulf/internal/app/warewulfd/response"
 	"github.com/spf13/cobra"
 	"net/http"
 )
@@ -9,17 +9,14 @@ import (
 // TODO: https://github.com/danderson/netboot/blob/master/pixiecore/dhcp.go
 // TODO: https://github.com/pin/tftp
 
-//const LocalStateDir = "/var/warewulf"
-
-
 func CobraRunE(cmd *cobra.Command, args []string) error {
 
-	http.HandleFunc("/ipxe/", warewulfd_responses.IpxeSend)
-	http.HandleFunc("/kernel/", warewulfd_responses.KernelSend)
-	http.HandleFunc("/kmods/", warewulfd_responses.KmodsSend)
-	http.HandleFunc("/vnfs/", warewulfd_responses.VnfsSend)
-	http.HandleFunc("/overlay-system/", warewulfd_responses.SystemOverlaySend)
-	http.HandleFunc("/overlay-runtime", warewulfd_responses.RuntimeOverlaySend)
+	http.HandleFunc("/ipxe/", response.IpxeSend)
+	http.HandleFunc("/kernel/", response.KernelSend)
+	http.HandleFunc("/kmods/", response.KmodsSend)
+	http.HandleFunc("/vnfs/", response.VnfsSend)
+	http.HandleFunc("/overlay-system/", response.SystemOverlaySend)
+	http.HandleFunc("/overlay-runtime", response.RuntimeOverlaySend)
 
 	http.ListenAndServe(":9873", nil)