diff --git a/.github/workflows/alpine-glibc.yaml b/.github/workflows/alpine-glibc.yaml
index f59bae2..de516eb 100644
--- a/.github/workflows/alpine-glibc.yaml
+++ b/.github/workflows/alpine-glibc.yaml
@@ -4,7 +4,7 @@ on:
   push:
     paths:
       - '.github/workflows/alpine-glibc-image.yaml'
-      - 'base/alpine-glibc/Dockerfile'
+      - 'oci/base/alpine-glibc/Dockerfile'
     branches:
       - main
 
@@ -21,7 +21,7 @@ jobs:
           registry: artifact.onwalk.net
           username: admin 
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          path: './base/alpine-glibc'
+          path: '.oci/base/alpine-glibc'
           build_file: 'Dockerfile'
           image: k8s/alpine-glibc
           tag: 2.34
diff --git a/.github/workflows/alpine-with-custom-ca.yaml b/.github/workflows/alpine-with-custom-ca.yaml
index 9b5cb4a..251cb84 100644
--- a/.github/workflows/alpine-with-custom-ca.yaml
+++ b/.github/workflows/alpine-with-custom-ca.yaml
@@ -3,7 +3,7 @@ on:
   pull_request:
   push:
     paths:
-      - 'base/alpine/Dockerfile'
+      - 'oci/base/alpine/Dockerfile'
       - '.github/workflows/alpine-with-custom-ca.yaml'
     branches:
       - main
@@ -21,7 +21,7 @@ jobs:
           registry: artifact.onwalk.net
           username: admin 
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: base/alpine/Dockerfile 
+          build_file: './oci/base/alpine/Dockerfile' 
           image: k8s/alpine-ca
           tag: latest
           cache: true
diff --git a/.github/workflows/app-runner-alpine.yaml b/.github/workflows/app-runner-alpine.yaml
index 0e9b7c4..6c93631 100644
--- a/.github/workflows/app-runner-alpine.yaml
+++ b/.github/workflows/app-runner-alpine.yaml
@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - '.github/workflows/app-runner-alpine.yaml'
-      - 'ci-runner/alpine/Dockerfile'
-      - 'ci-runner/alpine/Makefile'
-      - 'ci-runner/alpine/ca.crt'
-      - 'ci-runner/alpine/repositories'
+      - 'oci/ci-runner/alpine/Dockerfile'
+      - 'oci/ci-runner/alpine/Makefile'
+      - 'oci/ci-runner/alpine/ca.crt'
+      - 'oci/ci-runner/alpine/repositories'
     branches:
       - main
 
@@ -24,7 +24,7 @@ jobs:
           registry: artifact.onwalk.net
           username: admin 
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          path: './ci-runner/alpine'
+          path: './oci/ci-runner/alpine'
           build_file: 'Dockerfile'
           image: devops/ci-runner-alpine
           tag: latest
diff --git a/.github/workflows/flux-cli-image.yaml b/.github/workflows/fluxcd/flux-cli-image.yaml
similarity index 85%
rename from .github/workflows/flux-cli-image.yaml
rename to .github/workflows/fluxcd/flux-cli-image.yaml
index 34a5167..5e839a6 100644
--- a/.github/workflows/flux-cli-image.yaml
+++ b/.github/workflows/fluxcd/flux-cli-image.yaml
@@ -3,8 +3,8 @@ on:
   pull_request:
   push:
     paths:
-      - '.github/workflows/flux-cli-image.yaml'
-      - '.github/workflows/alpine-with-custom-ca.yaml'
+      - 'oci/fluxcd/flux-cli.Dockerfile'
+      - '.github/workflows/fluxcd/flux-cli-image.yaml'
     branches:
       - main
 
diff --git a/.github/workflows/flux-helm-controller-image.yaml b/.github/workflows/fluxcd/flux-helm-controller-image.yaml
similarity index 92%
rename from .github/workflows/flux-helm-controller-image.yaml
rename to .github/workflows/fluxcd/flux-helm-controller-image.yaml
index 4dcd3b9..7deb69f 100644
--- a/.github/workflows/flux-helm-controller-image.yaml
+++ b/.github/workflows/fluxcd/flux-helm-controller-image.yaml
@@ -3,7 +3,7 @@ on:
   pull_request:
   push:
     paths:
-      - '.github/workflows/alpine-with-custom-ca.yaml'
+      - 'oci/fluxcd/flux-helm-controller.Dockerfile'
       - '.github/workflows/flux-helm-controller-image.yaml'
     branches:
       - main
diff --git a/.github/workflows/flux-image-automation-controller.yaml b/.github/workflows/fluxcd/flux-image-automation-controller.yaml
similarity index 91%
rename from .github/workflows/flux-image-automation-controller.yaml
rename to .github/workflows/fluxcd/flux-image-automation-controller.yaml
index 86a222b..f6c3173 100644
--- a/.github/workflows/flux-image-automation-controller.yaml
+++ b/.github/workflows/fluxcd/flux-image-automation-controller.yaml
@@ -4,7 +4,7 @@ on:
   push:
     paths:
       - 'fluxcd/flux-image-automation-controller.Dockerfile'
-      - '.github/workflows/flux-image-automation-controller.yaml'
+      - '.github/workflows/fluxcd/flux-image-automation-controller.yaml'
     branches:
       - main
 
diff --git a/.github/workflows/flux-image-reflector-controller.yaml b/.github/workflows/fluxcd/flux-image-reflector-controller.yaml
similarity index 91%
rename from .github/workflows/flux-image-reflector-controller.yaml
rename to .github/workflows/fluxcd/flux-image-reflector-controller.yaml
index 32fe4ae..82438ba 100644
--- a/.github/workflows/flux-image-reflector-controller.yaml
+++ b/.github/workflows/fluxcd/flux-image-reflector-controller.yaml
@@ -4,7 +4,7 @@ on:
   push:
     paths:
       - 'fluxcd/flux-image-reflector-controller.Dockerfile'
-      - '.github/workflows/flux-image-reflector-controller.yaml'
+      - '.github/workflows/fluxcd/flux-image-reflector-controller.yaml'
     branches:
       - main
 
diff --git a/.github/workflows/flux-kustomize-controller-image.yaml b/.github/workflows/fluxcd/flux-kustomize-controller-image.yaml
similarity index 91%
rename from .github/workflows/flux-kustomize-controller-image.yaml
rename to .github/workflows/fluxcd/flux-kustomize-controller-image.yaml
index c02bf1f..155f40d 100644
--- a/.github/workflows/flux-kustomize-controller-image.yaml
+++ b/.github/workflows/fluxcd/flux-kustomize-controller-image.yaml
@@ -4,7 +4,7 @@ on:
   push:
     paths:
       - 'fluxcd/flux-kustomize-controller.Dockerfile'
-      - '.github/workflows/flux-kustomize-controller-image.yaml'
+      - '.github/workflows/fluxcd/flux-kustomize-controller-image.yaml'
     branches:
       - main
 
diff --git a/.github/workflows/flux-notification-controller-image.yaml b/.github/workflows/fluxcd/flux-notification-controller-image.yaml
similarity index 90%
rename from .github/workflows/flux-notification-controller-image.yaml
rename to .github/workflows/fluxcd/flux-notification-controller-image.yaml
index 29c1fe3..2244dab 100644
--- a/.github/workflows/flux-notification-controller-image.yaml
+++ b/.github/workflows/fluxcd/flux-notification-controller-image.yaml
@@ -3,7 +3,7 @@ on:
   pull_request:
   push:
     paths:
-      - '.github/workflows/flux-notification-controller-image.yaml'
+      - '.github/workflows/fluxcd/flux-notification-controller-image.yaml'
       - 'dockerfiles/flux-notification-controller.Dockerfile'
     branches:
       - main
diff --git a/.github/workflows/flux-source-controller-image.yaml b/.github/workflows/fluxcd/flux-source-controller-image.yaml
similarity index 91%
rename from .github/workflows/flux-source-controller-image.yaml
rename to .github/workflows/fluxcd/flux-source-controller-image.yaml
index 59dcb9e..b46f820 100644
--- a/.github/workflows/flux-source-controller-image.yaml
+++ b/.github/workflows/fluxcd/flux-source-controller-image.yaml
@@ -4,7 +4,7 @@ on:
   push:
     paths:
       - 'fluxcd/flux-source-controller.Dockerfile'
-      - '.github/workflows/flux-source-controller-image.yaml'
+      - '.github/workflows/fluxcd/flux-source-controller-image.yaml'
     branches:
       - main
 
diff --git a/.github/workflows/iac-runner-terraform.yaml b/.github/workflows/iac-runner-terraform.yaml
index a7c38fa..7f45af6 100644
--- a/.github/workflows/iac-runner-terraform.yaml
+++ b/.github/workflows/iac-runner-terraform.yaml
@@ -3,9 +3,9 @@ on:
   pull_request:
   push:
     paths:
-      - 'ci-runner/terraform/main.tf'
-      - 'ci-runner/terraform/Dockerfile'
-      - 'ci-runner/terraform/.terraformrc'
+      - 'oci/ci-runner/terraform/main.tf'
+      - 'oci/ci-runner/terraform/Dockerfile'
+      - 'oci/ci-runner/terraform/.terraformrc'
       - '.github/workflows/iac-runner-terraform.yaml'
     branches:
       - main
@@ -23,7 +23,7 @@ jobs:
           registry: artifact.onwalk.net
           username: admin 
           password: ${{ secrets.HELM_REPO_PASSWORD }}
-          path: './ci-runner/terraform'
+          path: './oci/ci-runner/terraform'
           build_file: 'Dockerfile'
           image: devops/ci-runner-terraform
           tag: latest
diff --git a/.github/workflows/packer/bootstrap.sh b/.github/workflows/packer/bootstrap.sh
new file mode 100644
index 0000000..c0f09bb
--- /dev/null
+++ b/.github/workflows/packer/bootstrap.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+echo " ***You can add bash scripts to install prerequisite software in you image in bootstrap.sh file ***"
+
+curl -sfL https://rancher-mirror.oss-cn-beijing.aliyuncs.com/k3s/k3s-install.sh | INSTALL_K3S_MIRROR=cn sh -
+sudo chown ubuntu:ubuntu /etc/rancher/k3s/k3s.yaml
+export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
+sudo wget https://mirrors.onwalk.net/tools/linux-amd64/helm.tar.gz && sudo tar -xvpf helm.tar.gz -C /usr/local/bin/
+sudo chmod 755 /usr/local/bin/helm
+helm repo add neuvector https://neuvector.github.io/neuvector-helm/
+#helm repo add nginx-stable https://helm.nginx.com/stable
+helm repo up
+#helm install ingress nginx-stable/nginx-ingress --set controller.enableCustomResources=false --set controller.appprotect.enable=false --set controller.hostNetwork=true
+sleep 30
+kubectl create namespace neuvector
+
diff --git a/.github/workflows/packer/build.sh b/.github/workflows/packer/build.sh
new file mode 100644
index 0000000..ce5839d
--- /dev/null
+++ b/.github/workflows/packer/build.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg
+echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+sudo apt update && sudo apt install packer
+
+mkdir -pv ~/.aws/
+cat > ~/.aws/credentials << EOF
+aws_access_key_id=XXXXXXXXXXXXXXXXX
+aws_secret_access_key=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+EOF
+
+cat > ~/.aws/config << EOF
+[default]
+region=cn-northwest-1
+output=json
+EOF
+
+packer hcl2_upgrade ubuntu-ami.json
+
+export AWS_ACCESS_KEY_ID=
+export AWS_SECRET_ACCESS_KEY=
+export AWS_SECURITY_TOKEN
+packer init .
+packer fmt .
+packer validate .
+packer build ubuntu-ami.json.pkr.hcl
diff --git a/.github/workflows/packer/golden-image-pipeline.yaml b/.github/workflows/packer/golden-image-pipeline.yaml
new file mode 100644
index 0000000..2e4221b
--- /dev/null
+++ b/.github/workflows/packer/golden-image-pipeline.yaml
@@ -0,0 +1,28 @@
+name: Create AWS Golden AMI
+  pull_request:
+  push:
+    paths:
+      - '.github/workflows/packer/build.sh'
+      - '.github/workflows/packer/bootstrap.sh'
+      - '.github/workflows/packer/ubuntu-os-ami.json'
+      - '.github/workflows/packer/ubuntu-os-ami.json.pkr.hcl'
+      - '.github/workflows/packer/golden-image-pipeline.yaml'
+    branches:
+      - main
+
+jobs:
+  create-golden-ami:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Packer
+      run: sudo apt-get install -y zip unzip jq
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+    - name: Download Packer
+      run: wget https://releases.hashicorp.com/packer/1.6.2/packer_1.6.2_linux_amd64.zip
+      shell: bash
+    - name: create image
+      run: build.sh
+      shell: bash
diff --git a/.github/workflows/packer/ubuntu-os-ami.json b/.github/workflows/packer/ubuntu-os-ami.json
new file mode 100644
index 0000000..76d39e0
--- /dev/null
+++ b/.github/workflows/packer/ubuntu-os-ami.json
@@ -0,0 +1,37 @@
+{
+    "variables": {
+        "aws_region": "cn-northwest-1",
+	"aws_accountId": "405306994013",
+        "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}",
+        "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}",
+        "aws_session_token": "{{env `AWS_SESSION_TOKEN`}}"
+    },
+    "builders": [
+        {
+            "type": "amazon-ebs",
+	    "access_key":               "{{user `aws_access_key`}}",
+            "secret_key":               "{{user `aws_secret_key`}}",
+            "token":                    "{{user `aws_session_token`}}",
+            "ami_name": "K3S-NeuVector-{{timestamp}}",
+            "instance_type": "t2.large",
+            "region": "{{user `aws_region`}}",
+            "source_ami_filter": {
+              "filters": {
+              "virtualization-type": "hvm",
+              "name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20220706",
+              "root-device-type": "ebs"
+              },
+              "owners": ["{{user `aws_accountId`}}"],
+              "most_recent": true
+            },
+            "ssh_username": "ubuntu"
+        }
+    ],
+
+  "provisioners": [
+    {
+            "type": "shell",
+            "script": "./scripts/ubuntu/bootstrap.sh"
+    }
+  ]
+}
diff --git a/.github/workflows/packer/ubuntu-os-ami.json.pkr.hcl b/.github/workflows/packer/ubuntu-os-ami.json.pkr.hcl
new file mode 100644
index 0000000..4cd90c8
--- /dev/null
+++ b/.github/workflows/packer/ubuntu-os-ami.json.pkr.hcl
@@ -0,0 +1,44 @@
+variable "aws_accountId" {
+  type    = string
+  default = "837727238323"
+}
+
+variable "aws_region" {
+  type    = string
+  default = "cn-northwest-1"
+}
+
+locals { timestamp = regex_replace(timestamp(), "[- TZ:]", "") }
+
+source "amazon-ebs" "ubuntu" {
+  ami_name      = "K3S-NeuVector-${local.timestamp}"
+  instance_type = "t2.large"
+  region        = "${var.aws_region}"
+  source_ami_filter {
+    filters = {
+      name                = "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*"
+      root-device-type    = "ebs"
+      virtualization-type = "hvm"
+    }
+    most_recent = true
+    owners      = ["${var.aws_accountId}"]
+  }
+  ssh_username = "ubuntu"
+}
+
+build {
+  sources = ["source.amazon-ebs.ubuntu"]
+  provisioner "shell" {
+    script = "./scripts/ubuntu/bootstrap.sh"
+  }
+
+}
+
+packer {
+  required_plugins {
+    amazon = {
+      version = ">= 0.0.2"
+      source  = "github.com/hashicorp/amazon"
+    }
+  }
+}
diff --git a/.github/workflows/prometheus-to-cloudwatch-image.yaml b/.github/workflows/prometheus-to-cloudwatch-image.yaml
index b500b0e..6e9b16a 100644
--- a/.github/workflows/prometheus-to-cloudwatch-image.yaml
+++ b/.github/workflows/prometheus-to-cloudwatch-image.yaml
@@ -3,10 +3,11 @@ on:
   pull_request:
   push:
     paths:
-      - 'prometheus-to-cloudwatch/main.go'
-      - 'prometheus-to-cloudwatch/Makefile'
-      - 'prometheus-to-cloudwatch/Dockerfile'
-      - 'prometheus-to-cloudwatch/prometheus_to_cloudwatch.go'
+      - 'oci/prometheus-to-cloudwatch/main.go'
+      - 'oci/prometheus-to-cloudwatch/Makefile'
+      - 'oci/prometheus-to-cloudwatch/Dockerfile'
+      - 'oci/prometheus-to-cloudwatch/prometheus_to_cloudwatch.go'
+      - '.github/workflows/packer/bootstrap.sh'
       - '.github/workflows/prometheus-to-cloudwatch-image.yaml'
     branches:
       - main
@@ -28,6 +29,7 @@ jobs:
           registry: artifact.onwalk.net
           username: admin  
           password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: 'oci/prometheus-to-cloudwatch'
           build_file: ./Dockerfile
           image: k8s/prometheus-to-cloudwatch
           tag: ${{ steps.slug.outputs.sha8 }}
diff --git a/base/alpine-glibc/Dockerfile b/oci/base/alpine-glibc/Dockerfile
similarity index 100%
rename from base/alpine-glibc/Dockerfile
rename to oci/base/alpine-glibc/Dockerfile
diff --git a/base/alpine/Dockerfile b/oci/base/alpine/Dockerfile
similarity index 100%
rename from base/alpine/Dockerfile
rename to oci/base/alpine/Dockerfile
diff --git a/base/alpine/ca.crt b/oci/base/alpine/ca.crt
similarity index 100%
rename from base/alpine/ca.crt
rename to oci/base/alpine/ca.crt
diff --git a/ci-runner/alpine/.gitlab-ci.yml b/oci/ci-runner/alpine/.gitlab-ci.yml
similarity index 100%
rename from ci-runner/alpine/.gitlab-ci.yml
rename to oci/ci-runner/alpine/.gitlab-ci.yml
diff --git a/ci-runner/alpine/Dockerfile b/oci/ci-runner/alpine/Dockerfile
similarity index 100%
rename from ci-runner/alpine/Dockerfile
rename to oci/ci-runner/alpine/Dockerfile
diff --git a/ci-runner/alpine/Makefile b/oci/ci-runner/alpine/Makefile
similarity index 100%
rename from ci-runner/alpine/Makefile
rename to oci/ci-runner/alpine/Makefile
diff --git a/ci-runner/alpine/README.md b/oci/ci-runner/alpine/README.md
similarity index 100%
rename from ci-runner/alpine/README.md
rename to oci/ci-runner/alpine/README.md
diff --git a/ci-runner/alpine/ca.crt b/oci/ci-runner/alpine/ca.crt
similarity index 100%
rename from ci-runner/alpine/ca.crt
rename to oci/ci-runner/alpine/ca.crt
diff --git a/ci-runner/alpine/repositories b/oci/ci-runner/alpine/repositories
similarity index 100%
rename from ci-runner/alpine/repositories
rename to oci/ci-runner/alpine/repositories
diff --git a/ci-runner/terraform/.gitlab-ci.yml b/oci/ci-runner/terraform/.gitlab-ci.yml
similarity index 100%
rename from ci-runner/terraform/.gitlab-ci.yml
rename to oci/ci-runner/terraform/.gitlab-ci.yml
diff --git a/ci-runner/terraform/.terraformrc b/oci/ci-runner/terraform/.terraformrc
similarity index 100%
rename from ci-runner/terraform/.terraformrc
rename to oci/ci-runner/terraform/.terraformrc
diff --git a/ci-runner/terraform/Dockerfile b/oci/ci-runner/terraform/Dockerfile
similarity index 100%
rename from ci-runner/terraform/Dockerfile
rename to oci/ci-runner/terraform/Dockerfile
diff --git a/ci-runner/terraform/Makefile b/oci/ci-runner/terraform/Makefile
similarity index 100%
rename from ci-runner/terraform/Makefile
rename to oci/ci-runner/terraform/Makefile
diff --git a/ci-runner/terraform/main.tf b/oci/ci-runner/terraform/main.tf
similarity index 100%
rename from ci-runner/terraform/main.tf
rename to oci/ci-runner/terraform/main.tf
diff --git a/ci-runner/terraform/repositories b/oci/ci-runner/terraform/repositories
similarity index 100%
rename from ci-runner/terraform/repositories
rename to oci/ci-runner/terraform/repositories
diff --git a/fluxcd/flux-cli.Dockerfile b/oci/fluxcd/flux-cli.Dockerfile
similarity index 100%
rename from fluxcd/flux-cli.Dockerfile
rename to oci/fluxcd/flux-cli.Dockerfile
diff --git a/fluxcd/flux-helm-controller.Dockerfile b/oci/fluxcd/flux-helm-controller.Dockerfile
similarity index 100%
rename from fluxcd/flux-helm-controller.Dockerfile
rename to oci/fluxcd/flux-helm-controller.Dockerfile
diff --git a/fluxcd/flux-helm-flux-image-automation-controller.Dockerfile b/oci/fluxcd/flux-helm-flux-image-automation-controller.Dockerfile
similarity index 100%
rename from fluxcd/flux-helm-flux-image-automation-controller.Dockerfile
rename to oci/fluxcd/flux-helm-flux-image-automation-controller.Dockerfile
diff --git a/fluxcd/flux-image-automation-controller.Dockerfile b/oci/fluxcd/flux-image-automation-controller.Dockerfile
similarity index 100%
rename from fluxcd/flux-image-automation-controller.Dockerfile
rename to oci/fluxcd/flux-image-automation-controller.Dockerfile
diff --git a/fluxcd/flux-image-reflector-controller.Dockerfile b/oci/fluxcd/flux-image-reflector-controller.Dockerfile
similarity index 100%
rename from fluxcd/flux-image-reflector-controller.Dockerfile
rename to oci/fluxcd/flux-image-reflector-controller.Dockerfile
diff --git a/fluxcd/flux-kustomize-controller.Dockerfile b/oci/fluxcd/flux-kustomize-controller.Dockerfile
similarity index 100%
rename from fluxcd/flux-kustomize-controller.Dockerfile
rename to oci/fluxcd/flux-kustomize-controller.Dockerfile
diff --git a/fluxcd/flux-notification-controller.Dockerfile b/oci/fluxcd/flux-notification-controller.Dockerfile
similarity index 100%
rename from fluxcd/flux-notification-controller.Dockerfile
rename to oci/fluxcd/flux-notification-controller.Dockerfile
diff --git a/fluxcd/flux-source-controller.Dockerfile b/oci/fluxcd/flux-source-controller.Dockerfile
similarity index 100%
rename from fluxcd/flux-source-controller.Dockerfile
rename to oci/fluxcd/flux-source-controller.Dockerfile
diff --git a/gitlab-templates/base.yml b/oci/gitlab-templates/base.yml
similarity index 100%
rename from gitlab-templates/base.yml
rename to oci/gitlab-templates/base.yml
diff --git a/gitlab-templates/build-and-push-image.yml b/oci/gitlab-templates/build-and-push-image.yml
similarity index 100%
rename from gitlab-templates/build-and-push-image.yml
rename to oci/gitlab-templates/build-and-push-image.yml
diff --git a/prometheus-to-cloudwatch/.travis.yml b/oci/prometheus-to-cloudwatch/.travis.yml
similarity index 100%
rename from prometheus-to-cloudwatch/.travis.yml
rename to oci/prometheus-to-cloudwatch/.travis.yml
diff --git a/prometheus-to-cloudwatch/Dockerfile b/oci/prometheus-to-cloudwatch/Dockerfile
similarity index 100%
rename from prometheus-to-cloudwatch/Dockerfile
rename to oci/prometheus-to-cloudwatch/Dockerfile
diff --git a/prometheus-to-cloudwatch/LICENSE b/oci/prometheus-to-cloudwatch/LICENSE
similarity index 100%
rename from prometheus-to-cloudwatch/LICENSE
rename to oci/prometheus-to-cloudwatch/LICENSE
diff --git a/prometheus-to-cloudwatch/Makefile b/oci/prometheus-to-cloudwatch/Makefile
similarity index 100%
rename from prometheus-to-cloudwatch/Makefile
rename to oci/prometheus-to-cloudwatch/Makefile
diff --git a/prometheus-to-cloudwatch/README.md b/oci/prometheus-to-cloudwatch/README.md
similarity index 100%
rename from prometheus-to-cloudwatch/README.md
rename to oci/prometheus-to-cloudwatch/README.md
diff --git a/prometheus-to-cloudwatch/README.yaml b/oci/prometheus-to-cloudwatch/README.yaml
similarity index 100%
rename from prometheus-to-cloudwatch/README.yaml
rename to oci/prometheus-to-cloudwatch/README.yaml
diff --git a/prometheus-to-cloudwatch/chart/.editorconfig b/oci/prometheus-to-cloudwatch/chart/.editorconfig
similarity index 100%
rename from prometheus-to-cloudwatch/chart/.editorconfig
rename to oci/prometheus-to-cloudwatch/chart/.editorconfig
diff --git a/prometheus-to-cloudwatch/chart/.helmignore b/oci/prometheus-to-cloudwatch/chart/.helmignore
similarity index 100%
rename from prometheus-to-cloudwatch/chart/.helmignore
rename to oci/prometheus-to-cloudwatch/chart/.helmignore
diff --git a/prometheus-to-cloudwatch/chart/Chart.yaml b/oci/prometheus-to-cloudwatch/chart/Chart.yaml
similarity index 100%
rename from prometheus-to-cloudwatch/chart/Chart.yaml
rename to oci/prometheus-to-cloudwatch/chart/Chart.yaml
diff --git a/prometheus-to-cloudwatch/chart/README.md b/oci/prometheus-to-cloudwatch/chart/README.md
similarity index 100%
rename from prometheus-to-cloudwatch/chart/README.md
rename to oci/prometheus-to-cloudwatch/chart/README.md
diff --git a/prometheus-to-cloudwatch/chart/requirements.yaml b/oci/prometheus-to-cloudwatch/chart/requirements.yaml
similarity index 100%
rename from prometheus-to-cloudwatch/chart/requirements.yaml
rename to oci/prometheus-to-cloudwatch/chart/requirements.yaml
diff --git a/prometheus-to-cloudwatch/chart/templates/NOTES.txt b/oci/prometheus-to-cloudwatch/chart/templates/NOTES.txt
similarity index 100%
rename from prometheus-to-cloudwatch/chart/templates/NOTES.txt
rename to oci/prometheus-to-cloudwatch/chart/templates/NOTES.txt
diff --git a/prometheus-to-cloudwatch/chart/templates/deployment.yaml b/oci/prometheus-to-cloudwatch/chart/templates/deployment.yaml
similarity index 100%
rename from prometheus-to-cloudwatch/chart/templates/deployment.yaml
rename to oci/prometheus-to-cloudwatch/chart/templates/deployment.yaml
diff --git a/prometheus-to-cloudwatch/chart/templates/secret.yaml b/oci/prometheus-to-cloudwatch/chart/templates/secret.yaml
similarity index 100%
rename from prometheus-to-cloudwatch/chart/templates/secret.yaml
rename to oci/prometheus-to-cloudwatch/chart/templates/secret.yaml
diff --git a/prometheus-to-cloudwatch/chart/values.yaml b/oci/prometheus-to-cloudwatch/chart/values.yaml
similarity index 100%
rename from prometheus-to-cloudwatch/chart/values.yaml
rename to oci/prometheus-to-cloudwatch/chart/values.yaml
diff --git a/prometheus-to-cloudwatch/go.mod b/oci/prometheus-to-cloudwatch/go.mod
similarity index 100%
rename from prometheus-to-cloudwatch/go.mod
rename to oci/prometheus-to-cloudwatch/go.mod
diff --git a/prometheus-to-cloudwatch/go.sum b/oci/prometheus-to-cloudwatch/go.sum
similarity index 100%
rename from prometheus-to-cloudwatch/go.sum
rename to oci/prometheus-to-cloudwatch/go.sum
diff --git a/prometheus-to-cloudwatch/images/kube-state-metrics-service.png b/oci/prometheus-to-cloudwatch/images/kube-state-metrics-service.png
similarity index 100%
rename from prometheus-to-cloudwatch/images/kube-state-metrics-service.png
rename to oci/prometheus-to-cloudwatch/images/kube-state-metrics-service.png
diff --git a/prometheus-to-cloudwatch/images/kube-state-metrics-to-cloudwatch.png b/oci/prometheus-to-cloudwatch/images/kube-state-metrics-to-cloudwatch.png
similarity index 100%
rename from prometheus-to-cloudwatch/images/kube-state-metrics-to-cloudwatch.png
rename to oci/prometheus-to-cloudwatch/images/kube-state-metrics-to-cloudwatch.png
diff --git a/prometheus-to-cloudwatch/main.go b/oci/prometheus-to-cloudwatch/main.go
similarity index 100%
rename from prometheus-to-cloudwatch/main.go
rename to oci/prometheus-to-cloudwatch/main.go
diff --git a/prometheus-to-cloudwatch/prometheus_to_cloudwatch.go b/oci/prometheus-to-cloudwatch/prometheus_to_cloudwatch.go
similarity index 100%
rename from prometheus-to-cloudwatch/prometheus_to_cloudwatch.go
rename to oci/prometheus-to-cloudwatch/prometheus_to_cloudwatch.go