diff --git a/events/BUILD b/core/events/BUILD
similarity index 100%
rename from events/BUILD
rename to core/events/BUILD
diff --git a/events/Dockerfile b/core/events/Dockerfile
similarity index 74%
rename from events/Dockerfile
rename to core/events/Dockerfile
index 567c77c..1b8c159 100644
--- a/events/Dockerfile
+++ b/core/events/Dockerfile
@@ -7,9 +7,9 @@
 ENV CGO_ENABLED 0
 ENV GO111MODULE on
 
-RUN mkdir -p $GOPATH/src/github.com/giolekva/pcloud/events
-COPY . $GOPATH/src/github.com/giolekva/pcloud/events
-WORKDIR $GOPATH/src/github.com/giolekva/pcloud/events/cmd
+RUN mkdir -p $GOPATH/src/github.com/giolekva/pcloud/core/events
+COPY . $GOPATH/src/github.com/giolekva/pcloud/core/events
+WORKDIR $GOPATH/src/github.com/giolekva/pcloud/core/events/cmd
 RUN go get ./...
 
 RUN mkdir -p /app/build
diff --git a/events/appmanager.go b/core/events/appmanager.go
similarity index 100%
rename from events/appmanager.go
rename to core/events/appmanager.go
diff --git a/events/chart/Chart.yaml b/core/events/chart/Chart.yaml
similarity index 100%
rename from events/chart/Chart.yaml
rename to core/events/chart/Chart.yaml
diff --git a/events/chart/README.md b/core/events/chart/README.md
similarity index 100%
rename from events/chart/README.md
rename to core/events/chart/README.md
diff --git a/events/chart/templates/deployment.yaml b/core/events/chart/templates/deployment.yaml
similarity index 100%
rename from events/chart/templates/deployment.yaml
rename to core/events/chart/templates/deployment.yaml
diff --git a/events/chart/values.yaml b/core/events/chart/values.yaml
similarity index 100%
rename from events/chart/values.yaml
rename to core/events/chart/values.yaml
diff --git a/events/client.go b/core/events/client.go
similarity index 100%
rename from events/client.go
rename to core/events/client.go
diff --git a/events/cmd/main.go b/core/events/cmd/main.go
similarity index 96%
rename from events/cmd/main.go
rename to core/events/cmd/main.go
index c272a4e..a3944e7 100644
--- a/events/cmd/main.go
+++ b/core/events/cmd/main.go
@@ -7,7 +7,7 @@
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
-	"github.com/giolekva/pcloud/events"
+	"github.com/giolekva/pcloud/core/events"
 
 	"github.com/golang/glog"
 )
diff --git a/events/event.go b/core/events/event.go
similarity index 100%
rename from events/event.go
rename to core/events/event.go
diff --git a/events/go.mod b/core/events/go.mod
similarity index 90%
rename from events/go.mod
rename to core/events/go.mod
index 2cea9b0..e832718 100644
--- a/events/go.mod
+++ b/core/events/go.mod
@@ -1,4 +1,4 @@
-module github.com/giolekva/pcloud/events
+module github.com/giolekva/pcloud/core/events
 
 go 1.14
 
diff --git a/events/go.sum b/core/events/go.sum
similarity index 100%
rename from events/go.sum
rename to core/events/go.sum
diff --git a/events/processor.go b/core/events/processor.go
similarity index 100%
rename from events/processor.go
rename to core/events/processor.go
diff --git a/dev/install_core_services.sh b/dev/install_core_services.sh
index 210d878..9668a31 100755
--- a/dev/install_core_services.sh
+++ b/dev/install_core_services.sh
@@ -10,8 +10,8 @@
 bazel run //core/appmanager:install
 
 # Event Processor
-bazel run //events:push_to_dev
-bazel run //events:install
+bazel run //core/events:push_to_dev
+bazel run //core/events:install
 
 # Knowledge Graph
 bazel run //controller:push_to_dev