diff --git a/main.go b/main.go
index 9273a6d767..263b35b1b7 100644
--- a/main.go
+++ b/main.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/nirmata/kube-policy/kubeclient"
 	"github.com/nirmata/kube-policy/policycontroller"
-	"github.com/nirmata/kube-policy/server"
+	"github.com/nirmata/kube-policy/webhooks"
 
 	policyclientset "github.com/nirmata/kube-policy/pkg/client/clientset/versioned"
 	informers "github.com/nirmata/kube-policy/pkg/client/informers/externalversions"
@@ -64,7 +64,7 @@ func main() {
 		log.Fatalf("Failed to initialize TLS key/certificate pair: %v\n", err)
 	}
 
-	server, err := server.NewWebhookServer(tlsPair, kubeclient, policyInformer.Lister(), nil)
+	server, err := webhooks.NewWebhookServer(tlsPair, kubeclient, policyInformer.Lister(), nil)
 	if err != nil {
 		log.Fatalf("Unable to create webhook server: %v\n", err)
 	}
diff --git a/server/server.go b/webhooks/server.go
similarity index 98%
rename from server/server.go
rename to webhooks/server.go
index 68894497fe..6a91b69ef6 100644
--- a/server/server.go
+++ b/webhooks/server.go
@@ -1,4 +1,4 @@
-package server
+package webhooks
 
 import (
 	"context"
@@ -20,7 +20,6 @@ import (
 	"github.com/nirmata/kube-policy/pkg/policyengine"
 	"github.com/nirmata/kube-policy/pkg/policyengine/mutation"
 	"github.com/nirmata/kube-policy/utils"
-	"github.com/nirmata/kube-policy/webhooks"
 	v1beta1 "k8s.io/api/admission/v1beta1"
 	"k8s.io/apimachinery/pkg/labels"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -88,7 +87,7 @@ func (ws *WebhookServer) serve(w http.ResponseWriter, r *http.Request) {
 		}
 
 		var admissionResponse *v1beta1.AdmissionResponse
-		if webhooks.AdmissionIsRequired(admissionReview.Request) {
+		if AdmissionIsRequired(admissionReview.Request) {
 			admissionResponse = ws.Mutate(admissionReview.Request)
 		}
 
diff --git a/webhooks/admission.go b/webhooks/utils.go
similarity index 100%
rename from webhooks/admission.go
rename to webhooks/utils.go