diff --git a/controller/BUILD b/core/api/BUILD
similarity index 100%
rename from controller/BUILD
rename to core/api/BUILD
diff --git a/controller/Dockerfile b/core/api/Dockerfile
similarity index 93%
rename from controller/Dockerfile
rename to core/api/Dockerfile
index a9fabd8..0d7f980 100644
--- a/controller/Dockerfile
+++ b/core/api/Dockerfile
@@ -9,7 +9,7 @@
 # RUN rm protoc-3.11.4-linux-x86_64.zip
 # ENV PATH=/protoc/bin:$PATH
 
-WORKDIR $GOPATH/src/github.com/giolekva/pcloud/controller
+WORKDIR $GOPATH/src/github.com/giolekva/pcloud/core/api
 COPY . .
 # RUN go get -v ./...
 
diff --git a/controller/chart/Chart.yaml b/core/api/chart/Chart.yaml
similarity index 100%
rename from controller/chart/Chart.yaml
rename to core/api/chart/Chart.yaml
diff --git a/controller/chart/README.md b/core/api/chart/README.md
similarity index 100%
rename from controller/chart/README.md
rename to core/api/chart/README.md
diff --git a/controller/chart/templates/deployment.yaml b/core/api/chart/templates/deployment.yaml
similarity index 100%
rename from controller/chart/templates/deployment.yaml
rename to core/api/chart/templates/deployment.yaml
diff --git a/controller/chart/templates/service.yaml b/core/api/chart/templates/service.yaml
similarity index 100%
rename from controller/chart/templates/service.yaml
rename to core/api/chart/templates/service.yaml
diff --git a/controller/chart/values.yaml b/core/api/chart/values.yaml
similarity index 100%
rename from controller/chart/values.yaml
rename to core/api/chart/values.yaml
diff --git a/controller/go.mod b/core/api/go.mod
similarity index 86%
rename from controller/go.mod
rename to core/api/go.mod
index c372a57..b163bb3 100644
--- a/controller/go.mod
+++ b/core/api/go.mod
@@ -1,4 +1,4 @@
-module github.com/giolekva/pcloud/controller
+module github.com/giolekva/pcloud/core/api
 
 go 1.14
 
diff --git a/controller/go.sum b/core/api/go.sum
similarity index 100%
rename from controller/go.sum
rename to core/api/go.sum
diff --git a/controller/main.go b/core/api/main.go
similarity index 97%
rename from controller/main.go
rename to core/api/main.go
index 5c3df86..db4f841 100644
--- a/controller/main.go
+++ b/core/api/main.go
@@ -9,7 +9,7 @@
 	"log"
 	"net/http"
 
-	"github.com/giolekva/pcloud/controller/schema"
+	"github.com/giolekva/pcloud/core/api/schema"
 
 	"github.com/golang/glog"
 	"github.com/itaysk/regogo"
diff --git a/controller/schema/dgraph_schema_store.go b/core/api/schema/dgraph_schema_store.go
similarity index 100%
rename from controller/schema/dgraph_schema_store.go
rename to core/api/schema/dgraph_schema_store.go
diff --git a/controller/schema/schema.go b/core/api/schema/schema.go
similarity index 100%
rename from controller/schema/schema.go
rename to core/api/schema/schema.go
diff --git a/controller/tests/query_test.go b/core/api/tests/query_test.go
similarity index 100%
rename from controller/tests/query_test.go
rename to core/api/tests/query_test.go
diff --git a/appmanager/BUILD b/core/appmanager/BUILD
similarity index 100%
rename from appmanager/BUILD
rename to core/appmanager/BUILD
diff --git a/appmanager/Dockerfile b/core/appmanager/Dockerfile
similarity index 89%
rename from appmanager/Dockerfile
rename to core/appmanager/Dockerfile
index 248c052..791ab67 100644
--- a/appmanager/Dockerfile
+++ b/core/appmanager/Dockerfile
@@ -12,7 +12,7 @@
 RUN wget -O helm.tar.gz https://get.helm.sh/helm-v3.2.1-$GOOS-$GOARCH.tar.gz
 RUN tar -xvf helm.tar.gz
 
-WORKDIR $GOPATH/src/github.com/giolekva/pcloud/appmanager
+WORKDIR $GOPATH/src/github.com/giolekva/pcloud/core/appmanager
 COPY . .
 RUN go build -o $GOPATH/bin/app-manager -trimpath -ldflags="-s -w" cmd/main.go
 
diff --git a/appmanager/actions.go b/core/appmanager/actions.go
similarity index 100%
rename from appmanager/actions.go
rename to core/appmanager/actions.go
diff --git a/appmanager/chart/Chart.yaml b/core/appmanager/chart/Chart.yaml
similarity index 100%
rename from appmanager/chart/Chart.yaml
rename to core/appmanager/chart/Chart.yaml
diff --git a/appmanager/chart/README.md b/core/appmanager/chart/README.md
similarity index 100%
rename from appmanager/chart/README.md
rename to core/appmanager/chart/README.md
diff --git a/appmanager/chart/templates/cluster-role-binding.yaml b/core/appmanager/chart/templates/cluster-role-binding.yaml
similarity index 100%
rename from appmanager/chart/templates/cluster-role-binding.yaml
rename to core/appmanager/chart/templates/cluster-role-binding.yaml
diff --git a/appmanager/chart/templates/cluster-role.yaml b/core/appmanager/chart/templates/cluster-role.yaml
similarity index 100%
rename from appmanager/chart/templates/cluster-role.yaml
rename to core/appmanager/chart/templates/cluster-role.yaml
diff --git a/appmanager/chart/templates/ingress.yaml b/core/appmanager/chart/templates/ingress.yaml
similarity index 100%
rename from appmanager/chart/templates/ingress.yaml
rename to core/appmanager/chart/templates/ingress.yaml
diff --git a/appmanager/chart/templates/service.yaml b/core/appmanager/chart/templates/service.yaml
similarity index 100%
rename from appmanager/chart/templates/service.yaml
rename to core/appmanager/chart/templates/service.yaml
diff --git a/appmanager/chart/templates/statefulset.yaml b/core/appmanager/chart/templates/statefulset.yaml
similarity index 100%
rename from appmanager/chart/templates/statefulset.yaml
rename to core/appmanager/chart/templates/statefulset.yaml
diff --git a/appmanager/chart/values.yaml b/core/appmanager/chart/values.yaml
similarity index 100%
rename from appmanager/chart/values.yaml
rename to core/appmanager/chart/values.yaml
diff --git a/appmanager/cmd/main.go b/core/appmanager/cmd/main.go
similarity index 98%
rename from appmanager/cmd/main.go
rename to core/appmanager/cmd/main.go
index d4205d2..8d6695d 100644
--- a/appmanager/cmd/main.go
+++ b/core/appmanager/cmd/main.go
@@ -22,7 +22,7 @@
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
-	app "github.com/giolekva/pcloud/appmanager"
+	app "github.com/giolekva/pcloud/core/appmanager"
 )
 
 var kubeconfig = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file.")
diff --git a/appmanager/go.mod b/core/appmanager/go.mod
similarity index 78%
rename from appmanager/go.mod
rename to core/appmanager/go.mod
index 284bf6d..96a749b 100644
--- a/appmanager/go.mod
+++ b/core/appmanager/go.mod
@@ -1,4 +1,4 @@
-module github.com/giolekva/pcloud/appmanager
+module github.com/giolekva/pcloud/core/appmanager
 
 go 1.14
 
diff --git a/appmanager/go.sum b/core/appmanager/go.sum
similarity index 100%
rename from appmanager/go.sum
rename to core/appmanager/go.sum
diff --git a/appmanager/helm.go b/core/appmanager/helm.go
similarity index 100%
rename from appmanager/helm.go
rename to core/appmanager/helm.go
diff --git a/appmanager/installer.go b/core/appmanager/installer.go
similarity index 100%
rename from appmanager/installer.go
rename to core/appmanager/installer.go
diff --git a/appmanager/launcher.go b/core/appmanager/launcher.go
similarity index 100%
rename from appmanager/launcher.go
rename to core/appmanager/launcher.go
diff --git a/appmanager/manager.go b/core/appmanager/manager.go
similarity index 100%
rename from appmanager/manager.go
rename to core/appmanager/manager.go
diff --git a/appmanager/schema.go b/core/appmanager/schema.go
similarity index 100%
rename from appmanager/schema.go
rename to core/appmanager/schema.go
diff --git a/appmanager/triggers.go b/core/appmanager/triggers.go
similarity index 100%
rename from appmanager/triggers.go
rename to core/appmanager/triggers.go
diff --git a/appmanager/triggers_test.go b/core/appmanager/triggers_test.go
similarity index 100%
rename from appmanager/triggers_test.go
rename to core/appmanager/triggers_test.go
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 339a014..0a7601f 100755
--- a/dev/install_core_services.sh
+++ b/dev/install_core_services.sh
@@ -6,14 +6,14 @@
 source $ROOT/apps/dgraph/install.sh
 
 # Application Manager
-bazel run //appmanager:push_to_dev
-bazel run //appmanager:install
+bazel run //core/appmanager:push_to_dev
+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
+bazel run //core/api:push_to_dev
 source $ROOT/dev/bootstrap_schema.sh
-bazel run //controller:install
+bazel run //core/api:install