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/dev/install_core_services.sh b/dev/install_core_services.sh
index 9668a31..0a7601f 100755
--- a/dev/install_core_services.sh
+++ b/dev/install_core_services.sh
@@ -14,6 +14,6 @@
 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