diff --git a/core/services/chainlink/CONFIG.md b/core/services/plugin/CONFIG.md
similarity index 100%
rename from core/services/chainlink/CONFIG.md
rename to core/services/plugin/CONFIG.md
diff --git a/core/services/chainlink/application.go b/core/services/plugin/application.go
similarity index 100%
rename from core/services/chainlink/application.go
rename to core/services/plugin/application.go
diff --git a/core/services/chainlink/cfgtest/cfgtest.go b/core/services/plugin/cfgtest/cfgtest.go
similarity index 100%
rename from core/services/chainlink/cfgtest/cfgtest.go
rename to core/services/plugin/cfgtest/cfgtest.go
diff --git a/core/services/chainlink/cfgtest/defaults.go b/core/services/plugin/cfgtest/defaults.go
similarity index 100%
rename from core/services/chainlink/cfgtest/defaults.go
rename to core/services/plugin/cfgtest/defaults.go
diff --git a/core/services/chainlink/config.go b/core/services/plugin/config.go
similarity index 100%
rename from core/services/chainlink/config.go
rename to core/services/plugin/config.go
diff --git a/core/services/chainlink/config_audit_logger.go b/core/services/plugin/config_audit_logger.go
similarity index 100%
rename from core/services/chainlink/config_audit_logger.go
rename to core/services/plugin/config_audit_logger.go
diff --git a/core/services/chainlink/config_audit_logger_test.go b/core/services/plugin/config_audit_logger_test.go
similarity index 100%
rename from core/services/chainlink/config_audit_logger_test.go
rename to core/services/plugin/config_audit_logger_test.go
diff --git a/core/services/chainlink/config_auto_pprof.go b/core/services/plugin/config_auto_pprof.go
similarity index 100%
rename from core/services/chainlink/config_auto_pprof.go
rename to core/services/plugin/config_auto_pprof.go
diff --git a/core/services/chainlink/config_auto_pprof_test.go b/core/services/plugin/config_auto_pprof_test.go
similarity index 100%
rename from core/services/chainlink/config_auto_pprof_test.go
rename to core/services/plugin/config_auto_pprof_test.go
diff --git a/core/services/chainlink/config_database.go b/core/services/plugin/config_database.go
similarity index 100%
rename from core/services/chainlink/config_database.go
rename to core/services/plugin/config_database.go
diff --git a/core/services/chainlink/config_database_test.go b/core/services/plugin/config_database_test.go
similarity index 100%
rename from core/services/chainlink/config_database_test.go
rename to core/services/plugin/config_database_test.go
diff --git a/core/services/chainlink/config_feature.go b/core/services/plugin/config_feature.go
similarity index 100%
rename from core/services/chainlink/config_feature.go
rename to core/services/plugin/config_feature.go
diff --git a/core/services/chainlink/config_feature_test.go b/core/services/plugin/config_feature_test.go
similarity index 100%
rename from core/services/chainlink/config_feature_test.go
rename to core/services/plugin/config_feature_test.go
diff --git a/core/services/chainlink/config_flux_monitor.go b/core/services/plugin/config_flux_monitor.go
similarity index 100%
rename from core/services/chainlink/config_flux_monitor.go
rename to core/services/plugin/config_flux_monitor.go
diff --git a/core/services/chainlink/config_flux_monitor_test.go b/core/services/plugin/config_flux_monitor_test.go
similarity index 100%
rename from core/services/chainlink/config_flux_monitor_test.go
rename to core/services/plugin/config_flux_monitor_test.go
diff --git a/core/services/chainlink/config_general.go b/core/services/plugin/config_general.go
similarity index 100%
rename from core/services/chainlink/config_general.go
rename to core/services/plugin/config_general.go
diff --git a/core/services/chainlink/config_general_dev_test.go b/core/services/plugin/config_general_dev_test.go
similarity index 100%
rename from core/services/chainlink/config_general_dev_test.go
rename to core/services/plugin/config_general_dev_test.go
diff --git a/core/services/chainlink/config_general_secrets.go b/core/services/plugin/config_general_secrets.go
similarity index 100%
rename from core/services/chainlink/config_general_secrets.go
rename to core/services/plugin/config_general_secrets.go
diff --git a/core/services/chainlink/config_general_state.go b/core/services/plugin/config_general_state.go
similarity index 100%
rename from core/services/chainlink/config_general_state.go
rename to core/services/plugin/config_general_state.go
diff --git a/core/services/chainlink/config_general_test.go b/core/services/plugin/config_general_test.go
similarity index 100%
rename from core/services/chainlink/config_general_test.go
rename to core/services/plugin/config_general_test.go
diff --git a/core/services/chainlink/config_insecure.go b/core/services/plugin/config_insecure.go
similarity index 100%
rename from core/services/chainlink/config_insecure.go
rename to core/services/plugin/config_insecure.go
diff --git a/core/services/chainlink/config_insecure_test.go b/core/services/plugin/config_insecure_test.go
similarity index 100%
rename from core/services/chainlink/config_insecure_test.go
rename to core/services/plugin/config_insecure_test.go
diff --git a/core/services/chainlink/config_job_pipeline.go b/core/services/plugin/config_job_pipeline.go
similarity index 100%
rename from core/services/chainlink/config_job_pipeline.go
rename to core/services/plugin/config_job_pipeline.go
diff --git a/core/services/chainlink/config_job_pipeline_test.go b/core/services/plugin/config_job_pipeline_test.go
similarity index 100%
rename from core/services/chainlink/config_job_pipeline_test.go
rename to core/services/plugin/config_job_pipeline_test.go
diff --git a/core/services/chainlink/config_keeper.go b/core/services/plugin/config_keeper.go
similarity index 100%
rename from core/services/chainlink/config_keeper.go
rename to core/services/plugin/config_keeper.go
diff --git a/core/services/chainlink/config_keeper_test.go b/core/services/plugin/config_keeper_test.go
similarity index 100%
rename from core/services/chainlink/config_keeper_test.go
rename to core/services/plugin/config_keeper_test.go
diff --git a/core/services/chainlink/config_log.go b/core/services/plugin/config_log.go
similarity index 100%
rename from core/services/chainlink/config_log.go
rename to core/services/plugin/config_log.go
diff --git a/core/services/chainlink/config_log_test.go b/core/services/plugin/config_log_test.go
similarity index 100%
rename from core/services/chainlink/config_log_test.go
rename to core/services/plugin/config_log_test.go
diff --git a/core/services/chainlink/config_mercury.go b/core/services/plugin/config_mercury.go
similarity index 100%
rename from core/services/chainlink/config_mercury.go
rename to core/services/plugin/config_mercury.go
diff --git a/core/services/chainlink/config_mercury_test.go b/core/services/plugin/config_mercury_test.go
similarity index 100%
rename from core/services/chainlink/config_mercury_test.go
rename to core/services/plugin/config_mercury_test.go
diff --git a/core/services/chainlink/config_ocr.go b/core/services/plugin/config_ocr.go
similarity index 100%
rename from core/services/chainlink/config_ocr.go
rename to core/services/plugin/config_ocr.go
diff --git a/core/services/chainlink/config_ocr2.go b/core/services/plugin/config_ocr2.go
similarity index 100%
rename from core/services/chainlink/config_ocr2.go
rename to core/services/plugin/config_ocr2.go
diff --git a/core/services/chainlink/config_ocr2_test.go b/core/services/plugin/config_ocr2_test.go
similarity index 100%
rename from core/services/chainlink/config_ocr2_test.go
rename to core/services/plugin/config_ocr2_test.go
diff --git a/core/services/chainlink/config_ocr_test.go b/core/services/plugin/config_ocr_test.go
similarity index 100%
rename from core/services/chainlink/config_ocr_test.go
rename to core/services/plugin/config_ocr_test.go
diff --git a/core/services/chainlink/config_p2p.go b/core/services/plugin/config_p2p.go
similarity index 100%
rename from core/services/chainlink/config_p2p.go
rename to core/services/plugin/config_p2p.go
diff --git a/core/services/chainlink/config_p2p_test.go b/core/services/plugin/config_p2p_test.go
similarity index 100%
rename from core/services/chainlink/config_p2p_test.go
rename to core/services/plugin/config_p2p_test.go
diff --git a/core/services/chainlink/config_password.go b/core/services/plugin/config_password.go
similarity index 100%
rename from core/services/chainlink/config_password.go
rename to core/services/plugin/config_password.go
diff --git a/core/services/chainlink/config_password_test.go b/core/services/plugin/config_password_test.go
similarity index 100%
rename from core/services/chainlink/config_password_test.go
rename to core/services/plugin/config_password_test.go
diff --git a/core/services/chainlink/config_prometheus.go b/core/services/plugin/config_prometheus.go
similarity index 100%
rename from core/services/chainlink/config_prometheus.go
rename to core/services/plugin/config_prometheus.go
diff --git a/core/services/chainlink/config_prometheus_test.go b/core/services/plugin/config_prometheus_test.go
similarity index 100%
rename from core/services/chainlink/config_prometheus_test.go
rename to core/services/plugin/config_prometheus_test.go
diff --git a/core/services/chainlink/config_pyroscope.go b/core/services/plugin/config_pyroscope.go
similarity index 100%
rename from core/services/chainlink/config_pyroscope.go
rename to core/services/plugin/config_pyroscope.go
diff --git a/core/services/chainlink/config_pyroscope_test.go b/core/services/plugin/config_pyroscope_test.go
similarity index 100%
rename from core/services/chainlink/config_pyroscope_test.go
rename to core/services/plugin/config_pyroscope_test.go
diff --git a/core/services/chainlink/config_sentry.go b/core/services/plugin/config_sentry.go
similarity index 100%
rename from core/services/chainlink/config_sentry.go
rename to core/services/plugin/config_sentry.go
diff --git a/core/services/chainlink/config_telemetry_ingress.go b/core/services/plugin/config_telemetry_ingress.go
similarity index 100%
rename from core/services/chainlink/config_telemetry_ingress.go
rename to core/services/plugin/config_telemetry_ingress.go
diff --git a/core/services/chainlink/config_telemetry_ingress_test.go b/core/services/plugin/config_telemetry_ingress_test.go
similarity index 100%
rename from core/services/chainlink/config_telemetry_ingress_test.go
rename to core/services/plugin/config_telemetry_ingress_test.go
diff --git a/core/services/chainlink/config_test.go b/core/services/plugin/config_test.go
similarity index 100%
rename from core/services/chainlink/config_test.go
rename to core/services/plugin/config_test.go
diff --git a/core/services/chainlink/config_threshold.go b/core/services/plugin/config_threshold.go
similarity index 100%
rename from core/services/chainlink/config_threshold.go
rename to core/services/plugin/config_threshold.go
diff --git a/core/services/chainlink/config_threshold_test.go b/core/services/plugin/config_threshold_test.go
similarity index 100%
rename from core/services/chainlink/config_threshold_test.go
rename to core/services/plugin/config_threshold_test.go
diff --git a/core/services/chainlink/config_tracing.go b/core/services/plugin/config_tracing.go
similarity index 100%
rename from core/services/chainlink/config_tracing.go
rename to core/services/plugin/config_tracing.go
diff --git a/core/services/chainlink/config_tracing_test.go b/core/services/plugin/config_tracing_test.go
similarity index 100%
rename from core/services/chainlink/config_tracing_test.go
rename to core/services/plugin/config_tracing_test.go
diff --git a/core/services/chainlink/config_web_server.go b/core/services/plugin/config_web_server.go
similarity index 100%
rename from core/services/chainlink/config_web_server.go
rename to core/services/plugin/config_web_server.go
diff --git a/core/services/chainlink/config_web_server_test.go b/core/services/plugin/config_web_server_test.go
similarity index 100%
rename from core/services/chainlink/config_web_server_test.go
rename to core/services/plugin/config_web_server_test.go
diff --git a/core/services/chainlink/legacy.env b/core/services/plugin/legacy.env
similarity index 100%
rename from core/services/chainlink/legacy.env
rename to core/services/plugin/legacy.env
diff --git a/core/services/chainlink/mocks/general_config.go b/core/services/plugin/mocks/general_config.go
similarity index 100%
rename from core/services/chainlink/mocks/general_config.go
rename to core/services/plugin/mocks/general_config.go
diff --git a/core/services/chainlink/mocks/relayer_chain_interoperators.go b/core/services/plugin/mocks/relayer_chain_interoperators.go
similarity index 100%
rename from core/services/chainlink/mocks/relayer_chain_interoperators.go
rename to core/services/plugin/mocks/relayer_chain_interoperators.go
diff --git a/core/services/chainlink/relayer_chain_interoperators.go b/core/services/plugin/relayer_chain_interoperators.go
similarity index 100%
rename from core/services/chainlink/relayer_chain_interoperators.go
rename to core/services/plugin/relayer_chain_interoperators.go
diff --git a/core/services/chainlink/relayer_chain_interoperators_test.go b/core/services/plugin/relayer_chain_interoperators_test.go
similarity index 100%
rename from core/services/chainlink/relayer_chain_interoperators_test.go
rename to core/services/plugin/relayer_chain_interoperators_test.go
diff --git a/core/services/chainlink/relayer_factory.go b/core/services/plugin/relayer_factory.go
similarity index 100%
rename from core/services/chainlink/relayer_factory.go
rename to core/services/plugin/relayer_factory.go
diff --git a/core/services/chainlink/secret_generator.go b/core/services/plugin/secret_generator.go
similarity index 100%
rename from core/services/chainlink/secret_generator.go
rename to core/services/plugin/secret_generator.go
diff --git a/core/services/chainlink/secret_generator_test.go b/core/services/plugin/secret_generator_test.go
similarity index 100%
rename from core/services/chainlink/secret_generator_test.go
rename to core/services/plugin/secret_generator_test.go
diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/plugin/testdata/config-empty-effective.toml
similarity index 100%
rename from core/services/chainlink/testdata/config-empty-effective.toml
rename to core/services/plugin/testdata/config-empty-effective.toml
diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/plugin/testdata/config-full.toml
similarity index 100%
rename from core/services/chainlink/testdata/config-full.toml
rename to core/services/plugin/testdata/config-full.toml
diff --git a/core/services/chainlink/testdata/config-invalid.toml b/core/services/plugin/testdata/config-invalid.toml
similarity index 100%
rename from core/services/chainlink/testdata/config-invalid.toml
rename to core/services/plugin/testdata/config-invalid.toml
diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/plugin/testdata/config-multi-chain-effective.toml
similarity index 100%
rename from core/services/chainlink/testdata/config-multi-chain-effective.toml
rename to core/services/plugin/testdata/config-multi-chain-effective.toml
diff --git a/core/services/chainlink/testdata/config-multi-chain.toml b/core/services/plugin/testdata/config-multi-chain.toml
similarity index 100%
rename from core/services/chainlink/testdata/config-multi-chain.toml
rename to core/services/plugin/testdata/config-multi-chain.toml
diff --git a/core/services/chainlink/testdata/mergingsecretsdata/config.toml b/core/services/plugin/testdata/mergingsecretsdata/config.toml
similarity index 100%
rename from core/services/chainlink/testdata/mergingsecretsdata/config.toml
rename to core/services/plugin/testdata/mergingsecretsdata/config.toml
diff --git a/core/services/chainlink/testdata/mergingsecretsdata/secrets-database.toml b/core/services/plugin/testdata/mergingsecretsdata/secrets-database.toml
similarity index 100%
rename from core/services/chainlink/testdata/mergingsecretsdata/secrets-database.toml
rename to core/services/plugin/testdata/mergingsecretsdata/secrets-database.toml
diff --git a/core/services/chainlink/testdata/mergingsecretsdata/secrets-mercury-split-one.toml b/core/services/plugin/testdata/mergingsecretsdata/secrets-mercury-split-one.toml
similarity index 100%
rename from core/services/chainlink/testdata/mergingsecretsdata/secrets-mercury-split-one.toml
rename to core/services/plugin/testdata/mergingsecretsdata/secrets-mercury-split-one.toml
diff --git a/core/services/chainlink/testdata/mergingsecretsdata/secrets-mercury-split-two.toml b/core/services/plugin/testdata/mergingsecretsdata/secrets-mercury-split-two.toml
similarity index 100%
rename from core/services/chainlink/testdata/mergingsecretsdata/secrets-mercury-split-two.toml
rename to core/services/plugin/testdata/mergingsecretsdata/secrets-mercury-split-two.toml
diff --git a/core/services/chainlink/testdata/mergingsecretsdata/secrets-password.toml b/core/services/plugin/testdata/mergingsecretsdata/secrets-password.toml
similarity index 100%
rename from core/services/chainlink/testdata/mergingsecretsdata/secrets-password.toml
rename to core/services/plugin/testdata/mergingsecretsdata/secrets-password.toml
diff --git a/core/services/chainlink/testdata/mergingsecretsdata/secrets-prometheus.toml b/core/services/plugin/testdata/mergingsecretsdata/secrets-prometheus.toml
similarity index 100%
rename from core/services/chainlink/testdata/mergingsecretsdata/secrets-prometheus.toml
rename to core/services/plugin/testdata/mergingsecretsdata/secrets-prometheus.toml
diff --git a/core/services/chainlink/testdata/mergingsecretsdata/secrets-pyroscope.toml b/core/services/plugin/testdata/mergingsecretsdata/secrets-pyroscope.toml
similarity index 100%
rename from core/services/chainlink/testdata/mergingsecretsdata/secrets-pyroscope.toml
rename to core/services/plugin/testdata/mergingsecretsdata/secrets-pyroscope.toml
diff --git a/core/services/chainlink/testdata/mergingsecretsdata/secrets-threshold.toml b/core/services/plugin/testdata/mergingsecretsdata/secrets-threshold.toml
similarity index 100%
rename from core/services/chainlink/testdata/mergingsecretsdata/secrets-threshold.toml
rename to core/services/plugin/testdata/mergingsecretsdata/secrets-threshold.toml
diff --git a/core/services/chainlink/testdata/mergingsecretsdata/secrets-webserver-ldap.toml b/core/services/plugin/testdata/mergingsecretsdata/secrets-webserver-ldap.toml
similarity index 100%
rename from core/services/chainlink/testdata/mergingsecretsdata/secrets-webserver-ldap.toml
rename to core/services/plugin/testdata/mergingsecretsdata/secrets-webserver-ldap.toml
diff --git a/core/services/chainlink/testdata/secrets-empty-effective.toml b/core/services/plugin/testdata/secrets-empty-effective.toml
similarity index 100%
rename from core/services/chainlink/testdata/secrets-empty-effective.toml
rename to core/services/plugin/testdata/secrets-empty-effective.toml
diff --git a/core/services/chainlink/testdata/secrets-full-redacted.toml b/core/services/plugin/testdata/secrets-full-redacted.toml
similarity index 100%
rename from core/services/chainlink/testdata/secrets-full-redacted.toml
rename to core/services/plugin/testdata/secrets-full-redacted.toml
diff --git a/core/services/chainlink/testdata/secrets-full.toml b/core/services/plugin/testdata/secrets-full.toml
similarity index 100%
rename from core/services/chainlink/testdata/secrets-full.toml
rename to core/services/plugin/testdata/secrets-full.toml
diff --git a/core/services/chainlink/testdata/secrets-multi-redacted.toml b/core/services/plugin/testdata/secrets-multi-redacted.toml
similarity index 100%
rename from core/services/chainlink/testdata/secrets-multi-redacted.toml
rename to core/services/plugin/testdata/secrets-multi-redacted.toml
diff --git a/core/services/chainlink/testdata/secrets-multi.toml b/core/services/plugin/testdata/secrets-multi.toml
similarity index 100%
rename from core/services/chainlink/testdata/secrets-multi.toml
rename to core/services/plugin/testdata/secrets-multi.toml
diff --git a/core/services/chainlink/types.go b/core/services/plugin/types.go
similarity index 100%
rename from core/services/chainlink/types.go
rename to core/services/plugin/types.go