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/dev/install_core_services.sh b/dev/install_core_services.sh
index 339a014..210d878 100755
--- a/dev/install_core_services.sh
+++ b/dev/install_core_services.sh
@@ -6,8 +6,8 @@
 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