diff --git a/components/azure/OWNERS b/components/contrib/azure/OWNERS
similarity index 100%
rename from components/azure/OWNERS
rename to components/contrib/azure/OWNERS
diff --git a/components/azure/azuredevops/queue-pipeline/Dockerfile b/components/contrib/azure/azuredevops/queue-pipeline/Dockerfile
similarity index 100%
rename from components/azure/azuredevops/queue-pipeline/Dockerfile
rename to components/contrib/azure/azuredevops/queue-pipeline/Dockerfile
diff --git a/components/azure/azuredevops/queue-pipeline/build_image.sh b/components/contrib/azure/azuredevops/queue-pipeline/build_image.sh
similarity index 100%
rename from components/azure/azuredevops/queue-pipeline/build_image.sh
rename to components/contrib/azure/azuredevops/queue-pipeline/build_image.sh
diff --git a/components/azure/azuredevops/queue-pipeline/component.yaml b/components/contrib/azure/azuredevops/queue-pipeline/component.yaml
similarity index 100%
rename from components/azure/azuredevops/queue-pipeline/component.yaml
rename to components/contrib/azure/azuredevops/queue-pipeline/component.yaml
diff --git a/components/azure/azuredevops/queue-pipeline/readme.md b/components/contrib/azure/azuredevops/queue-pipeline/readme.md
similarity index 100%
rename from components/azure/azuredevops/queue-pipeline/readme.md
rename to components/contrib/azure/azuredevops/queue-pipeline/readme.md
diff --git a/components/azure/azuredevops/queue-pipeline/src/queue_pipeline.py b/components/contrib/azure/azuredevops/queue-pipeline/src/queue_pipeline.py
similarity index 100%
rename from components/azure/azuredevops/queue-pipeline/src/queue_pipeline.py
rename to components/contrib/azure/azuredevops/queue-pipeline/src/queue_pipeline.py
diff --git a/components/azure/azuredevops/readme.md b/components/contrib/azure/azuredevops/readme.md
similarity index 100%
rename from components/azure/azuredevops/readme.md
rename to components/contrib/azure/azuredevops/readme.md
diff --git a/components/azure/azureml/aml-deploy-model/DockerFile b/components/contrib/azure/azureml/aml-deploy-model/DockerFile
similarity index 100%
rename from components/azure/azureml/aml-deploy-model/DockerFile
rename to components/contrib/azure/azureml/aml-deploy-model/DockerFile
diff --git a/components/azure/azureml/aml-deploy-model/README.MD b/components/contrib/azure/azureml/aml-deploy-model/README.MD
similarity index 100%
rename from components/azure/azureml/aml-deploy-model/README.MD
rename to components/contrib/azure/azureml/aml-deploy-model/README.MD
diff --git a/components/azure/azureml/aml-deploy-model/compile_pipeline.py b/components/contrib/azure/azureml/aml-deploy-model/compile_pipeline.py
similarity index 100%
rename from components/azure/azureml/aml-deploy-model/compile_pipeline.py
rename to components/contrib/azure/azureml/aml-deploy-model/compile_pipeline.py
diff --git a/components/azure/azureml/aml-deploy-model/component.yaml b/components/contrib/azure/azureml/aml-deploy-model/component.yaml
similarity index 100%
rename from components/azure/azureml/aml-deploy-model/component.yaml
rename to components/contrib/azure/azureml/aml-deploy-model/component.yaml
diff --git a/components/azure/azureml/aml-deploy-model/src/deploy.sh b/components/contrib/azure/azureml/aml-deploy-model/src/deploy.sh
similarity index 100%
rename from components/azure/azureml/aml-deploy-model/src/deploy.sh
rename to components/contrib/azure/azureml/aml-deploy-model/src/deploy.sh
diff --git a/components/azure/azureml/aml-deploy-model/src/deploymentconfig.json b/components/contrib/azure/azureml/aml-deploy-model/src/deploymentconfig.json
similarity index 100%
rename from components/azure/azureml/aml-deploy-model/src/deploymentconfig.json
rename to components/contrib/azure/azureml/aml-deploy-model/src/deploymentconfig.json
diff --git a/components/azure/azureml/aml-deploy-model/src/deploymentconfig_aks.json b/components/contrib/azure/azureml/aml-deploy-model/src/deploymentconfig_aks.json
similarity index 100%
rename from components/azure/azureml/aml-deploy-model/src/deploymentconfig_aks.json
rename to components/contrib/azure/azureml/aml-deploy-model/src/deploymentconfig_aks.json
diff --git a/components/azure/azureml/aml-deploy-model/src/environment.yml b/components/contrib/azure/azureml/aml-deploy-model/src/environment.yml
similarity index 100%
rename from components/azure/azureml/aml-deploy-model/src/environment.yml
rename to components/contrib/azure/azureml/aml-deploy-model/src/environment.yml
diff --git a/components/azure/azureml/aml-deploy-model/src/inferenceconfig.json b/components/contrib/azure/azureml/aml-deploy-model/src/inferenceconfig.json
similarity index 100%
rename from components/azure/azureml/aml-deploy-model/src/inferenceconfig.json
rename to components/contrib/azure/azureml/aml-deploy-model/src/inferenceconfig.json
diff --git a/components/azure/azureml/aml-deploy-model/src/score.py b/components/contrib/azure/azureml/aml-deploy-model/src/score.py
similarity index 100%
rename from components/azure/azureml/aml-deploy-model/src/score.py
rename to components/contrib/azure/azureml/aml-deploy-model/src/score.py
diff --git a/components/azure/azureml/aml-register-model/Dockerfile b/components/contrib/azure/azureml/aml-register-model/Dockerfile
similarity index 100%
rename from components/azure/azureml/aml-register-model/Dockerfile
rename to components/contrib/azure/azureml/aml-register-model/Dockerfile
diff --git a/components/azure/azureml/aml-register-model/README.MD b/components/contrib/azure/azureml/aml-register-model/README.MD
similarity index 100%
rename from components/azure/azureml/aml-register-model/README.MD
rename to components/contrib/azure/azureml/aml-register-model/README.MD
diff --git a/components/azure/azureml/aml-register-model/build.sh b/components/contrib/azure/azureml/aml-register-model/build.sh
similarity index 100%
rename from components/azure/azureml/aml-register-model/build.sh
rename to components/contrib/azure/azureml/aml-register-model/build.sh
diff --git a/components/azure/azureml/aml-register-model/component.yaml b/components/contrib/azure/azureml/aml-register-model/component.yaml
similarity index 100%
rename from components/azure/azureml/aml-register-model/component.yaml
rename to components/contrib/azure/azureml/aml-register-model/component.yaml
diff --git a/components/azure/azureml/aml-register-model/requirements.txt b/components/contrib/azure/azureml/aml-register-model/requirements.txt
similarity index 100%
rename from components/azure/azureml/aml-register-model/requirements.txt
rename to components/contrib/azure/azureml/aml-register-model/requirements.txt
diff --git a/components/azure/azureml/aml-register-model/src/register.py b/components/contrib/azure/azureml/aml-register-model/src/register.py
similarity index 100%
rename from components/azure/azureml/aml-register-model/src/register.py
rename to components/contrib/azure/azureml/aml-register-model/src/register.py
diff --git a/components/azure/azuresynapse/runsparkjob/Dockerfile b/components/contrib/azure/azuresynapse/runsparkjob/Dockerfile
similarity index 100%
rename from components/azure/azuresynapse/runsparkjob/Dockerfile
rename to components/contrib/azure/azuresynapse/runsparkjob/Dockerfile
diff --git a/components/azure/azuresynapse/runsparkjob/README.md b/components/contrib/azure/azuresynapse/runsparkjob/README.md
similarity index 100%
rename from components/azure/azuresynapse/runsparkjob/README.md
rename to components/contrib/azure/azuresynapse/runsparkjob/README.md
diff --git a/components/azure/azuresynapse/runsparkjob/component.yaml b/components/contrib/azure/azuresynapse/runsparkjob/component.yaml
similarity index 100%
rename from components/azure/azuresynapse/runsparkjob/component.yaml
rename to components/contrib/azure/azuresynapse/runsparkjob/component.yaml
diff --git a/components/azure/azuresynapse/runsparkjob/sample.py b/components/contrib/azure/azuresynapse/runsparkjob/sample.py
similarity index 100%
rename from components/azure/azuresynapse/runsparkjob/sample.py
rename to components/contrib/azure/azuresynapse/runsparkjob/sample.py
diff --git a/components/azure/azuresynapse/runsparkjob/src/requirement.txt b/components/contrib/azure/azuresynapse/runsparkjob/src/requirement.txt
similarity index 100%
rename from components/azure/azuresynapse/runsparkjob/src/requirement.txt
rename to components/contrib/azure/azuresynapse/runsparkjob/src/requirement.txt
diff --git a/components/azure/azuresynapse/runsparkjob/src/spark_pool_config.yaml b/components/contrib/azure/azuresynapse/runsparkjob/src/spark_pool_config.yaml
similarity index 100%
rename from components/azure/azuresynapse/runsparkjob/src/spark_pool_config.yaml
rename to components/contrib/azure/azuresynapse/runsparkjob/src/spark_pool_config.yaml
diff --git a/components/azure/azuresynapse/runsparkjob/src/submit_job.sh b/components/contrib/azure/azuresynapse/runsparkjob/src/submit_job.sh
similarity index 100%
rename from components/azure/azuresynapse/runsparkjob/src/submit_job.sh
rename to components/contrib/azure/azuresynapse/runsparkjob/src/submit_job.sh
diff --git a/components/great-expectations/validate/CSV/component.py b/components/contrib/great-expectations/validate/CSV/component.py
similarity index 100%
rename from components/great-expectations/validate/CSV/component.py
rename to components/contrib/great-expectations/validate/CSV/component.py
diff --git a/components/great-expectations/validate/CSV/component.yaml b/components/contrib/great-expectations/validate/CSV/component.yaml
similarity index 100%
rename from components/great-expectations/validate/CSV/component.yaml
rename to components/contrib/great-expectations/validate/CSV/component.yaml
diff --git a/components/great-expectations/validate/_samples/expectation_suite.json b/components/contrib/great-expectations/validate/_samples/expectation_suite.json
similarity index 100%
rename from components/great-expectations/validate/_samples/expectation_suite.json
rename to components/contrib/great-expectations/validate/_samples/expectation_suite.json
diff --git a/components/great-expectations/validate/_samples/sample_pipleine.py b/components/contrib/great-expectations/validate/_samples/sample_pipleine.py
similarity index 100%
rename from components/great-expectations/validate/_samples/sample_pipleine.py
rename to components/contrib/great-expectations/validate/_samples/sample_pipleine.py
diff --git a/components/kubeflow/common/launch_crd.py b/components/contrib/kubeflow/common/launch_crd.py
similarity index 100%
rename from components/kubeflow/common/launch_crd.py
rename to components/contrib/kubeflow/common/launch_crd.py
diff --git a/components/kubeflow/deployer/Dockerfile b/components/contrib/kubeflow/deployer/Dockerfile
similarity index 100%
rename from components/kubeflow/deployer/Dockerfile
rename to components/contrib/kubeflow/deployer/Dockerfile
diff --git a/components/kubeflow/deployer/component.yaml b/components/contrib/kubeflow/deployer/component.yaml
similarity index 100%
rename from components/kubeflow/deployer/component.yaml
rename to components/contrib/kubeflow/deployer/component.yaml
diff --git a/components/kubeflow/deployer/src/deploy.sh b/components/contrib/kubeflow/deployer/src/deploy.sh
similarity index 100%
rename from components/kubeflow/deployer/src/deploy.sh
rename to components/contrib/kubeflow/deployer/src/deploy.sh
diff --git a/components/kubeflow/dnntrainer/Dockerfile b/components/contrib/kubeflow/dnntrainer/Dockerfile
similarity index 100%
rename from components/kubeflow/dnntrainer/Dockerfile
rename to components/contrib/kubeflow/dnntrainer/Dockerfile
diff --git a/components/kubeflow/dnntrainer/build_image.sh b/components/contrib/kubeflow/dnntrainer/build_image.sh
similarity index 100%
rename from components/kubeflow/dnntrainer/build_image.sh
rename to components/contrib/kubeflow/dnntrainer/build_image.sh
diff --git a/components/kubeflow/dnntrainer/component.yaml b/components/contrib/kubeflow/dnntrainer/component.yaml
similarity index 100%
rename from components/kubeflow/dnntrainer/component.yaml
rename to components/contrib/kubeflow/dnntrainer/component.yaml
diff --git a/components/kubeflow/dnntrainer/requirements.txt b/components/contrib/kubeflow/dnntrainer/requirements.txt
similarity index 100%
rename from components/kubeflow/dnntrainer/requirements.txt
rename to components/contrib/kubeflow/dnntrainer/requirements.txt
diff --git a/components/kubeflow/dnntrainer/src/__init__.py b/components/contrib/kubeflow/dnntrainer/src/__init__.py
similarity index 100%
rename from components/kubeflow/dnntrainer/src/__init__.py
rename to components/contrib/kubeflow/dnntrainer/src/__init__.py
diff --git a/components/kubeflow/dnntrainer/src/setup.py b/components/contrib/kubeflow/dnntrainer/src/setup.py
similarity index 100%
rename from components/kubeflow/dnntrainer/src/setup.py
rename to components/contrib/kubeflow/dnntrainer/src/setup.py
diff --git a/components/kubeflow/dnntrainer/src/trainer/__init__.py b/components/contrib/kubeflow/dnntrainer/src/trainer/__init__.py
similarity index 100%
rename from components/kubeflow/dnntrainer/src/trainer/__init__.py
rename to components/contrib/kubeflow/dnntrainer/src/trainer/__init__.py
diff --git a/components/kubeflow/dnntrainer/src/trainer/task.py b/components/contrib/kubeflow/dnntrainer/src/trainer/task.py
similarity index 100%
rename from components/kubeflow/dnntrainer/src/trainer/task.py
rename to components/contrib/kubeflow/dnntrainer/src/trainer/task.py
diff --git a/components/kubeflow/katib-launcher/Dockerfile b/components/contrib/kubeflow/katib-launcher/Dockerfile
similarity index 100%
rename from components/kubeflow/katib-launcher/Dockerfile
rename to components/contrib/kubeflow/katib-launcher/Dockerfile
diff --git a/components/kubeflow/katib-launcher/OWNERS b/components/contrib/kubeflow/katib-launcher/OWNERS
similarity index 100%
rename from components/kubeflow/katib-launcher/OWNERS
rename to components/contrib/kubeflow/katib-launcher/OWNERS
diff --git a/components/kubeflow/katib-launcher/build_image.sh b/components/contrib/kubeflow/katib-launcher/build_image.sh
similarity index 100%
rename from components/kubeflow/katib-launcher/build_image.sh
rename to components/contrib/kubeflow/katib-launcher/build_image.sh
diff --git a/components/kubeflow/katib-launcher/component.yaml b/components/contrib/kubeflow/katib-launcher/component.yaml
similarity index 100%
rename from components/kubeflow/katib-launcher/component.yaml
rename to components/contrib/kubeflow/katib-launcher/component.yaml
diff --git a/components/kubeflow/katib-launcher/requirements.txt b/components/contrib/kubeflow/katib-launcher/requirements.txt
similarity index 100%
rename from components/kubeflow/katib-launcher/requirements.txt
rename to components/contrib/kubeflow/katib-launcher/requirements.txt
diff --git a/components/kubeflow/katib-launcher/src/__init__.py b/components/contrib/kubeflow/katib-launcher/src/__init__.py
similarity index 100%
rename from components/kubeflow/katib-launcher/src/__init__.py
rename to components/contrib/kubeflow/katib-launcher/src/__init__.py
diff --git a/components/kubeflow/katib-launcher/src/launch_experiment.py b/components/contrib/kubeflow/katib-launcher/src/launch_experiment.py
similarity index 100%
rename from components/kubeflow/katib-launcher/src/launch_experiment.py
rename to components/contrib/kubeflow/katib-launcher/src/launch_experiment.py
diff --git a/components/kubeflow/kfserving/Dockerfile b/components/contrib/kubeflow/kfserving/Dockerfile
similarity index 100%
rename from components/kubeflow/kfserving/Dockerfile
rename to components/contrib/kubeflow/kfserving/Dockerfile
diff --git a/components/kubeflow/kfserving/OWNERS b/components/contrib/kubeflow/kfserving/OWNERS
similarity index 100%
rename from components/kubeflow/kfserving/OWNERS
rename to components/contrib/kubeflow/kfserving/OWNERS
diff --git a/components/kubeflow/kfserving/README.md b/components/contrib/kubeflow/kfserving/README.md
similarity index 100%
rename from components/kubeflow/kfserving/README.md
rename to components/contrib/kubeflow/kfserving/README.md
diff --git a/components/kubeflow/kfserving/component.yaml b/components/contrib/kubeflow/kfserving/component.yaml
similarity index 100%
rename from components/kubeflow/kfserving/component.yaml
rename to components/contrib/kubeflow/kfserving/component.yaml
diff --git a/components/kubeflow/kfserving/requirements.txt b/components/contrib/kubeflow/kfserving/requirements.txt
similarity index 100%
rename from components/kubeflow/kfserving/requirements.txt
rename to components/contrib/kubeflow/kfserving/requirements.txt
diff --git a/components/kubeflow/kfserving/src/kfservingdeployer.py b/components/contrib/kubeflow/kfserving/src/kfservingdeployer.py
similarity index 100%
rename from components/kubeflow/kfserving/src/kfservingdeployer.py
rename to components/contrib/kubeflow/kfserving/src/kfservingdeployer.py
diff --git a/components/kubeflow/launcher/Dockerfile b/components/contrib/kubeflow/launcher/Dockerfile
similarity index 100%
rename from components/kubeflow/launcher/Dockerfile
rename to components/contrib/kubeflow/launcher/Dockerfile
diff --git a/components/kubeflow/launcher/OWNERS b/components/contrib/kubeflow/launcher/OWNERS
similarity index 100%
rename from components/kubeflow/launcher/OWNERS
rename to components/contrib/kubeflow/launcher/OWNERS
diff --git a/components/kubeflow/launcher/build_image.sh b/components/contrib/kubeflow/launcher/build_image.sh
similarity index 100%
rename from components/kubeflow/launcher/build_image.sh
rename to components/contrib/kubeflow/launcher/build_image.sh
diff --git a/components/kubeflow/launcher/component.yaml b/components/contrib/kubeflow/launcher/component.yaml
similarity index 100%
rename from components/kubeflow/launcher/component.yaml
rename to components/contrib/kubeflow/launcher/component.yaml
diff --git a/components/kubeflow/launcher/requirements.txt b/components/contrib/kubeflow/launcher/requirements.txt
similarity index 100%
rename from components/kubeflow/launcher/requirements.txt
rename to components/contrib/kubeflow/launcher/requirements.txt
diff --git a/components/kubeflow/launcher/sample.py b/components/contrib/kubeflow/launcher/sample.py
similarity index 100%
rename from components/kubeflow/launcher/sample.py
rename to components/contrib/kubeflow/launcher/sample.py
diff --git a/components/kubeflow/launcher/src/__init__.py b/components/contrib/kubeflow/launcher/src/__init__.py
similarity index 100%
rename from components/kubeflow/launcher/src/__init__.py
rename to components/contrib/kubeflow/launcher/src/__init__.py
diff --git a/components/kubeflow/launcher/src/launch_tfjob.py b/components/contrib/kubeflow/launcher/src/launch_tfjob.py
similarity index 100%
rename from components/kubeflow/launcher/src/launch_tfjob.py
rename to components/contrib/kubeflow/launcher/src/launch_tfjob.py
diff --git a/components/kubeflow/pytorch-launcher/Dockerfile b/components/contrib/kubeflow/pytorch-launcher/Dockerfile
similarity index 100%
rename from components/kubeflow/pytorch-launcher/Dockerfile
rename to components/contrib/kubeflow/pytorch-launcher/Dockerfile
diff --git a/components/kubeflow/pytorch-launcher/build_image.sh b/components/contrib/kubeflow/pytorch-launcher/build_image.sh
similarity index 100%
rename from components/kubeflow/pytorch-launcher/build_image.sh
rename to components/contrib/kubeflow/pytorch-launcher/build_image.sh
diff --git a/components/kubeflow/pytorch-launcher/component.yaml b/components/contrib/kubeflow/pytorch-launcher/component.yaml
similarity index 100%
rename from components/kubeflow/pytorch-launcher/component.yaml
rename to components/contrib/kubeflow/pytorch-launcher/component.yaml
diff --git a/components/kubeflow/pytorch-launcher/requirements.txt b/components/contrib/kubeflow/pytorch-launcher/requirements.txt
similarity index 100%
rename from components/kubeflow/pytorch-launcher/requirements.txt
rename to components/contrib/kubeflow/pytorch-launcher/requirements.txt
diff --git a/components/kubeflow/pytorch-launcher/sample.py b/components/contrib/kubeflow/pytorch-launcher/sample.py
similarity index 100%
rename from components/kubeflow/pytorch-launcher/sample.py
rename to components/contrib/kubeflow/pytorch-launcher/sample.py
diff --git a/components/kubeflow/pytorch-launcher/src/__init__.py b/components/contrib/kubeflow/pytorch-launcher/src/__init__.py
similarity index 100%
rename from components/kubeflow/pytorch-launcher/src/__init__.py
rename to components/contrib/kubeflow/pytorch-launcher/src/__init__.py
diff --git a/components/kubeflow/pytorch-launcher/src/launch_pytorchjob.py b/components/contrib/kubeflow/pytorch-launcher/src/launch_pytorchjob.py
similarity index 100%
rename from components/kubeflow/pytorch-launcher/src/launch_pytorchjob.py
rename to components/contrib/kubeflow/pytorch-launcher/src/launch_pytorchjob.py
diff --git a/components/local/base/Dockerfile b/components/contrib/local/base/Dockerfile
similarity index 100%
rename from components/local/base/Dockerfile
rename to components/contrib/local/base/Dockerfile
diff --git a/components/local/base/build_image.sh b/components/contrib/local/base/build_image.sh
similarity index 100%
rename from components/local/base/build_image.sh
rename to components/contrib/local/base/build_image.sh
diff --git a/components/local/base/requirements.txt b/components/contrib/local/base/requirements.txt
similarity index 100%
rename from components/local/base/requirements.txt
rename to components/contrib/local/base/requirements.txt
diff --git a/components/local/confusion_matrix/Dockerfile b/components/contrib/local/confusion_matrix/Dockerfile
similarity index 100%
rename from components/local/confusion_matrix/Dockerfile
rename to components/contrib/local/confusion_matrix/Dockerfile
diff --git a/components/local/confusion_matrix/build_image.sh b/components/contrib/local/confusion_matrix/build_image.sh
similarity index 100%
rename from components/local/confusion_matrix/build_image.sh
rename to components/contrib/local/confusion_matrix/build_image.sh
diff --git a/components/local/confusion_matrix/component.yaml b/components/contrib/local/confusion_matrix/component.yaml
similarity index 100%
rename from components/local/confusion_matrix/component.yaml
rename to components/contrib/local/confusion_matrix/component.yaml
diff --git a/components/local/confusion_matrix/src/confusion_matrix.py b/components/contrib/local/confusion_matrix/src/confusion_matrix.py
similarity index 100%
rename from components/local/confusion_matrix/src/confusion_matrix.py
rename to components/contrib/local/confusion_matrix/src/confusion_matrix.py
diff --git a/components/local/roc/Dockerfile b/components/contrib/local/roc/Dockerfile
similarity index 100%
rename from components/local/roc/Dockerfile
rename to components/contrib/local/roc/Dockerfile
diff --git a/components/local/roc/build_image.sh b/components/contrib/local/roc/build_image.sh
similarity index 100%
rename from components/local/roc/build_image.sh
rename to components/contrib/local/roc/build_image.sh
diff --git a/components/local/roc/component.yaml b/components/contrib/local/roc/component.yaml
similarity index 100%
rename from components/local/roc/component.yaml
rename to components/contrib/local/roc/component.yaml
diff --git a/components/local/roc/src/roc.py b/components/contrib/local/roc/src/roc.py
similarity index 100%
rename from components/local/roc/src/roc.py
rename to components/contrib/local/roc/src/roc.py