diff --git a/Makefile b/Makefile
index 7908567f0a0..4f0f8876154 100644
--- a/Makefile
+++ b/Makefile
@@ -223,7 +223,7 @@ test-python-universal-postgres-offline:
 
 test-python-universal-postgres-online:
 	PYTHONPATH='.' \
-		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.postgres_repo_configuration \
+		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.postgres_online_store.postgres_repo_configuration \
 		PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.postgres \
 		python -m pytest -n 8 --integration \
  			-k "not test_universal_cli and \
@@ -242,7 +242,7 @@ test-python-universal-postgres-online:
 
  test-python-universal-pgvector-online:
 	PYTHONPATH='.' \
-		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.pgvector_repo_configuration \
+		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.pgvector_repo_configuration \
 		PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.postgres \
 		python -m pytest -n 8 --integration \
  			-k "not test_universal_cli and \
@@ -261,7 +261,7 @@ test-python-universal-postgres-online:
 
  test-python-universal-mysql-online:
 	PYTHONPATH='.' \
-		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.mysql_repo_configuration \
+		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.mysql_online_store.mysql_repo_configuration \
 		PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.mysql \
 		python -m pytest -n 8 --integration \
  			-k "not test_universal_cli and \
@@ -280,14 +280,14 @@ test-python-universal-postgres-online:
 
 test-python-universal-cassandra:
 	PYTHONPATH='.' \
-	FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.cassandra_repo_configuration \
+	FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_online_store.cassandra_repo_configuration \
 	PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.cassandra \
 	python -m pytest -x --integration \
 	sdk/python/tests
 
 test-python-universal-hazelcast:
 	PYTHONPATH='.' \
-		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.hazelcast_repo_configuration \
+		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.hazelcast_online_store.hazelcast_repo_configuration \
 		PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.hazelcast \
 		python -m pytest -n 8 --integration \
  			-k "not test_universal_cli and \
@@ -306,7 +306,7 @@ test-python-universal-hazelcast:
 
 test-python-universal-cassandra-no-cloud-providers:
 	PYTHONPATH='.' \
-	FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.cassandra_repo_configuration \
+	FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_online_store.cassandra_repo_configuration \
 	PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.cassandra \
 	python -m pytest -x --integration \
 	-k "not test_lambda_materialization_consistency   and \
@@ -323,7 +323,7 @@ test-python-universal-cassandra-no-cloud-providers:
 
  test-python-universal-elasticsearch-online:
 	PYTHONPATH='.' \
-		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.elasticsearch_repo_configuration \
+		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.elasticsearch_online_store.elasticsearch_repo_configuration \
 		PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.elasticsearch \
 		python -m pytest -n 8 --integration \
  			-k "not test_universal_cli and \
@@ -342,7 +342,7 @@ test-python-universal-cassandra-no-cloud-providers:
 
 test-python-universal-singlestore-online:
 	PYTHONPATH='.' \
-		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.singlestore_repo_configuration \
+		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.singlestore_repo_configuration \
 		PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.singlestore \
 		python -m pytest -n 8 --integration \
 			-k "not test_universal_cli and \
@@ -353,7 +353,7 @@ test-python-universal-singlestore-online:
 
  test-python-universal-qdrant-online:
 	PYTHONPATH='.' \
-		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.qdrant_repo_configuration \
+		FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.qdrant_online_store.qdrant_repo_configuration \
 		PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.qdrant \
 		python -m pytest -n 8 --integration \
  			-k "test_retrieve_online_documents" \
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index 91ef61dac94..325b9673538 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -105,13 +105,13 @@
   * [DynamoDB](reference/online-stores/dynamodb.md)
   * [Bigtable](reference/online-stores/bigtable.md)
   * [Remote](reference/online-stores/remote.md)
-  * [PostgreSQL (contrib)](reference/online-stores/postgres.md)
-  * [Cassandra + Astra DB (contrib)](reference/online-stores/cassandra.md) 
-  * [Couchbase (contrib)](reference/online-stores/couchbase.md) 
-  * [MySQL (contrib)](reference/online-stores/mysql.md)
-  * [Hazelcast (contrib)](reference/online-stores/hazelcast.md)
-  * [ScyllaDB (contrib)](reference/online-stores/scylladb.md)
-  * [SingleStore (contrib)](reference/online-stores/singlestore.md)
+  * [PostgreSQL](reference/online-stores/postgres.md)
+  * [Cassandra + Astra DB](reference/online-stores/cassandra.md) 
+  * [Couchbase](reference/online-stores/couchbase.md) 
+  * [MySQL](reference/online-stores/mysql.md)
+  * [Hazelcast](reference/online-stores/hazelcast.md)
+  * [ScyllaDB](reference/online-stores/scylladb.md)
+  * [SingleStore](reference/online-stores/singlestore.md)
 * [Registries](reference/registries/README.md)
   * [Local](reference/registries/local.md)
   * [S3](reference/registries/s3.md)
diff --git a/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md b/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md
index 440205f8f11..5e26f133cef 100644
--- a/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md
+++ b/docs/how-to-guides/customizing-feast/adding-support-for-a-new-online-store.md
@@ -372,7 +372,7 @@ class RedisOnlineStoreCreator(OnlineStoreCreator):
 ```Makefile
 test-python-universal-cassandra:
 	PYTHONPATH='.' \
-	FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.contrib.cassandra_repo_configuration \
+	FULL_REPO_CONFIGS_MODULE=sdk.python.feast.infra.online_stores.cassandra_online_store.cassandra_repo_configuration \
 	PYTEST_PLUGINS=sdk.python.tests.integration.feature_repos.universal.online_store.cassandra \
 	IS_TEST=True \
 	python -m pytest -x --integration \
diff --git a/docs/reference/online-stores/cassandra.md b/docs/reference/online-stores/cassandra.md
index 61659ba7a2d..198f15ca47f 100644
--- a/docs/reference/online-stores/cassandra.md
+++ b/docs/reference/online-stores/cassandra.md
@@ -1,4 +1,4 @@
-# Cassandra + Astra DB online store (contrib)
+# Cassandra + Astra DB online store
 
 ## Description
 
@@ -59,7 +59,7 @@ online_store:
 ```
 {% endcode %}
 
-The full set of configuration options is available in [CassandraOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig).
+The full set of configuration options is available in [CassandraOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig).
 For a full explanation of configuration options please look at file
 `sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/README.md`.
 
diff --git a/docs/reference/online-stores/elasticsearch.md b/docs/reference/online-stores/elasticsearch.md
index bf6f9a58db1..81d267a1c65 100644
--- a/docs/reference/online-stores/elasticsearch.md
+++ b/docs/reference/online-stores/elasticsearch.md
@@ -1,4 +1,4 @@
-# ElasticSearch online store (contrib)
+# ElasticSearch online store
 
 ## Description
 
@@ -26,7 +26,7 @@ online_store:
 ```
 {% endcode %}
 
-The full set of configuration options is available in [ElasticsearchOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.elasticsearch.ElasticsearchOnlineStoreConfig).
+The full set of configuration options is available in [ElasticsearchOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.elasticsearch_online_store.ElasticsearchOnlineStoreConfig).
 
 ## Functionality Matrix
 
diff --git a/docs/reference/online-stores/mysql.md b/docs/reference/online-stores/mysql.md
index cbc48457e13..8868e64279d 100644
--- a/docs/reference/online-stores/mysql.md
+++ b/docs/reference/online-stores/mysql.md
@@ -1,4 +1,4 @@
-# MySQL online store (contrib)
+# MySQL online store
 
 ## Description
 
@@ -26,7 +26,7 @@ online_store:
 ```
 {% endcode %}
 
-The full set of configuration options is available in [MySQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.mysql.MySQLOnlineStoreConfig).
+The full set of configuration options is available in [MySQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.mysql_online_store.MySQLOnlineStoreConfig).
 
 ## Functionality Matrix
 
diff --git a/docs/reference/online-stores/postgres.md b/docs/reference/online-stores/postgres.md
index e4e2173ccd7..53feaff3dfe 100644
--- a/docs/reference/online-stores/postgres.md
+++ b/docs/reference/online-stores/postgres.md
@@ -1,4 +1,4 @@
-# PostgreSQL online store (contrib)
+# PostgreSQL online store
 
 ## Description
 
@@ -35,7 +35,7 @@ online_store:
 ```
 {% endcode %}
 
-The full set of configuration options is available in [PostgreSQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStoreConfig).
+The full set of configuration options is available in [PostgreSQLOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStoreConfig).
 
 ## Functionality Matrix
 
@@ -79,7 +79,7 @@ For the Retrieval Augmented  Generation (RAG) use-case, you have to embed the qu
 {% code title="python" %}
 ```python
 from feast import FeatureStore
-from feast.infra.online_stores.postgres import retrieve_online_documents
+from feast.infra.online_stores.postgres_online_store import retrieve_online_documents
 
 feature_store = FeatureStore(repo_path=".")
 
diff --git a/docs/reference/online-stores/qdrant.md b/docs/reference/online-stores/qdrant.md
index 66f4a59d24e..d3f1eebf319 100644
--- a/docs/reference/online-stores/qdrant.md
+++ b/docs/reference/online-stores/qdrant.md
@@ -1,4 +1,4 @@
-# Qdrant online store (contrib)
+# Qdrant online store
 
 ## Description
 
@@ -26,7 +26,7 @@ online_store:
 
 {% endcode %}
 
-The full set of configuration options is available in [QdrantOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.qdrant.QdrantOnlineStoreConfig).
+The full set of configuration options is available in [QdrantOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.qdrant_online_store.QdrantOnlineStoreConfig).
 
 ## Functionality Matrix
 
diff --git a/docs/reference/online-stores/scylladb.md b/docs/reference/online-stores/scylladb.md
index e28e810e214..c8583ac101a 100644
--- a/docs/reference/online-stores/scylladb.md
+++ b/docs/reference/online-stores/scylladb.md
@@ -55,7 +55,7 @@ online_store:
 {% endcode %}
 
 
-The full set of configuration options is available in [CassandraOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig).
+The full set of configuration options is available in [CassandraOnlineStoreConfig](https://rtd.feast.dev/en/master/#feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig).
 For a full explanation of configuration options please look at file
 `sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/README.md`.
 
diff --git a/docs/reference/online-stores/singlestore.md b/docs/reference/online-stores/singlestore.md
index 1777787f227..7272233b9dc 100644
--- a/docs/reference/online-stores/singlestore.md
+++ b/docs/reference/online-stores/singlestore.md
@@ -1,4 +1,4 @@
-# SingleStore online store (contrib)
+# SingleStore online store
 
 ## Description
 
diff --git a/sdk/python/docs/index.rst b/sdk/python/docs/index.rst
index 86354f80c72..14af6a6d9ef 100644
--- a/sdk/python/docs/index.rst
+++ b/sdk/python/docs/index.rst
@@ -359,28 +359,28 @@ Snowflake Online Store
 PostgreSQL Online Store
 -----------------------
 
-.. autoclass:: feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStore
+.. autoclass:: feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStore
     :members:
 
-.. autoclass:: feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStoreConfig
+.. autoclass:: feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStoreConfig
     :members:
 
 HBase Online Store
 -----------------------
 
-.. autoclass:: feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStore
+.. autoclass:: feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore
     :members:
 
-.. autoclass:: feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStoreConfig
+.. autoclass:: feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStoreConfig
     :members:
 
 Cassandra Online Store
 -----------------------
 
-.. autoclass:: feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStore
+.. autoclass:: feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore
     :members:
 
-.. autoclass:: feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig
+.. autoclass:: feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig
     :members:
 
 Batch Materialization Engine
diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.cassandra_online_store.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.cassandra_online_store.rst
index 3770cc8af70..e52318fd4f8 100644
--- a/sdk/python/docs/source/feast.infra.online_stores.contrib.cassandra_online_store.rst
+++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.cassandra_online_store.rst
@@ -7,7 +7,7 @@ Submodules
 feast.infra.online\_stores.contrib.cassandra\_online\_store.cassandra\_online\_store module
 -------------------------------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store
+.. automodule:: feast.infra.online_stores.cassandra_online_store.cassandra_online_store
    :members:
    :undoc-members:
    :show-inheritance:
@@ -15,7 +15,7 @@ feast.infra.online\_stores.contrib.cassandra\_online\_store.cassandra\_online\_s
 Module contents
 ---------------
 
-.. automodule:: feast.infra.online_stores.contrib.cassandra_online_store
+.. automodule:: feast.infra.online_stores.cassandra_online_store
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.hazelcast_online_store.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.hazelcast_online_store.rst
index bf3ed9d7d64..c50109a9769 100644
--- a/sdk/python/docs/source/feast.infra.online_stores.contrib.hazelcast_online_store.rst
+++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.hazelcast_online_store.rst
@@ -7,7 +7,7 @@ Submodules
 feast.infra.online\_stores.contrib.hazelcast\_online\_store.hazelcast\_online\_store module
 -------------------------------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.hazelcast_online_store.hazelcast_online_store
+.. automodule:: feast.infra.online_stores.hazelcast_online_store.hazelcast_online_store
    :members:
    :undoc-members:
    :show-inheritance:
@@ -15,7 +15,7 @@ feast.infra.online\_stores.contrib.hazelcast\_online\_store.hazelcast\_online\_s
 Module contents
 ---------------
 
-.. automodule:: feast.infra.online_stores.contrib.hazelcast_online_store
+.. automodule:: feast.infra.online_stores.hazelcast_online_store
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.hbase_online_store.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.hbase_online_store.rst
index ce249023049..f4393116dad 100644
--- a/sdk/python/docs/source/feast.infra.online_stores.contrib.hbase_online_store.rst
+++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.hbase_online_store.rst
@@ -7,7 +7,7 @@ Submodules
 feast.infra.online\_stores.contrib.hbase\_online\_store.hbase module
 --------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.hbase_online_store.hbase
+.. automodule:: feast.infra.online_stores.hbase_online_store.hbase
    :members:
    :undoc-members:
    :show-inheritance:
@@ -15,7 +15,7 @@ feast.infra.online\_stores.contrib.hbase\_online\_store.hbase module
 Module contents
 ---------------
 
-.. automodule:: feast.infra.online_stores.contrib.hbase_online_store
+.. automodule:: feast.infra.online_stores.hbase_online_store
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.ikv_online_store.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.ikv_online_store.rst
index e7f858d1cf4..812e30932d5 100644
--- a/sdk/python/docs/source/feast.infra.online_stores.contrib.ikv_online_store.rst
+++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.ikv_online_store.rst
@@ -7,7 +7,7 @@ Submodules
 feast.infra.online\_stores.contrib.ikv\_online\_store.ikv module
 ----------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.ikv_online_store.ikv
+.. automodule:: feast.infra.online_stores.ikv_online_store.ikv
    :members:
    :undoc-members:
    :show-inheritance:
@@ -15,7 +15,7 @@ feast.infra.online\_stores.contrib.ikv\_online\_store.ikv module
 Module contents
 ---------------
 
-.. automodule:: feast.infra.online_stores.contrib.ikv_online_store
+.. automodule:: feast.infra.online_stores.ikv_online_store
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.mysql_online_store.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.mysql_online_store.rst
index 036922d658f..720a0f31833 100644
--- a/sdk/python/docs/source/feast.infra.online_stores.contrib.mysql_online_store.rst
+++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.mysql_online_store.rst
@@ -7,7 +7,7 @@ Submodules
 feast.infra.online\_stores.contrib.mysql\_online\_store.mysql module
 --------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.mysql_online_store.mysql
+.. automodule:: feast.infra.online_stores.mysql_online_store.mysql
    :members:
    :undoc-members:
    :show-inheritance:
@@ -15,7 +15,7 @@ feast.infra.online\_stores.contrib.mysql\_online\_store.mysql module
 Module contents
 ---------------
 
-.. automodule:: feast.infra.online_stores.contrib.mysql_online_store
+.. automodule:: feast.infra.online_stores.mysql_online_store
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/sdk/python/docs/source/feast.infra.online_stores.contrib.rst b/sdk/python/docs/source/feast.infra.online_stores.contrib.rst
index ac47a34b441..d77e7d175d5 100644
--- a/sdk/python/docs/source/feast.infra.online_stores.contrib.rst
+++ b/sdk/python/docs/source/feast.infra.online_stores.contrib.rst
@@ -7,12 +7,12 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
-   feast.infra.online_stores.contrib.cassandra_online_store
-   feast.infra.online_stores.contrib.couchbase_online_store
-   feast.infra.online_stores.contrib.hazelcast_online_store
-   feast.infra.online_stores.contrib.hbase_online_store
-   feast.infra.online_stores.contrib.ikv_online_store
-   feast.infra.online_stores.contrib.mysql_online_store
+   feast.infra.online_stores.cassandra_online_store
+   feast.infra.online_stores.couchbase_online_store
+   feast.infra.online_stores.hazelcast_online_store
+   feast.infra.online_stores.hbase_online_store
+   feast.infra.online_stores.ikv_online_store
+   feast.infra.online_stores.mysql_online_store
 
 Submodules
 ----------
@@ -20,7 +20,7 @@ Submodules
 feast.infra.online\_stores.contrib.cassandra\_repo\_configuration module
 ------------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.cassandra_repo_configuration
+.. automodule:: feast.infra.online_stores.cassandra_online_store.cassandra_repo_configuration
    :members:
    :undoc-members:
    :show-inheritance:
@@ -36,7 +36,7 @@ feast.infra.online\_stores.contrib.couchbase\_repo\_configuration module
 feast.infra.online\_stores.contrib.elasticsearch module
 -------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.elasticsearch
+.. automodule:: feast.infra.online_stores.elasticsearch_online_store
    :members:
    :undoc-members:
    :show-inheritance:
@@ -44,7 +44,7 @@ feast.infra.online\_stores.contrib.elasticsearch module
 feast.infra.online\_stores.contrib.elasticsearch\_repo\_configuration module
 ----------------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.elasticsearch_repo_configuration
+.. automodule:: feast.infra.online_stores.elasticsearch_online_store.elasticsearch_repo_configuration
    :members:
    :undoc-members:
    :show-inheritance:
@@ -52,7 +52,7 @@ feast.infra.online\_stores.contrib.elasticsearch\_repo\_configuration module
 feast.infra.online\_stores.contrib.qdrant module
 -------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.qdrant
+.. automodule:: feast.infra.online_stores.qdrant_online_store
    :members:
    :undoc-members:
    :show-inheritance:
@@ -60,7 +60,7 @@ feast.infra.online\_stores.contrib.qdrant module
 feast.infra.online\_stores.contrib.qdrant\_repo\_configuration module
 ----------------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.qdrant_repo_configuration
+.. automodule:: feast.infra.online_stores.qdrant_online_store.qdrant_repo_configuration
    :members:
    :undoc-members:
    :show-inheritance:
@@ -68,7 +68,7 @@ feast.infra.online\_stores.contrib.qdrant\_repo\_configuration module
 feast.infra.online\_stores.contrib.hazelcast\_repo\_configuration module
 ------------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.hazelcast_repo_configuration
+.. automodule:: feast.infra.online_stores.hazelcast_online_store.hazelcast_repo_configuration
    :members:
    :undoc-members:
    :show-inheritance:
@@ -76,7 +76,7 @@ feast.infra.online\_stores.contrib.hazelcast\_repo\_configuration module
 feast.infra.online\_stores.contrib.hbase\_repo\_configuration module
 --------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.hbase_repo_configuration
+.. automodule:: feast.infra.online_stores.hbase_online_store.hbase_repo_configuration
    :members:
    :undoc-members:
    :show-inheritance:
@@ -84,7 +84,7 @@ feast.infra.online\_stores.contrib.hbase\_repo\_configuration module
 feast.infra.online\_stores.contrib.mysql\_repo\_configuration module
 --------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.mysql_repo_configuration
+.. automodule:: feast.infra.online_stores.mysql_online_store.mysql_repo_configuration
    :members:
    :undoc-members:
    :show-inheritance:
@@ -92,7 +92,7 @@ feast.infra.online\_stores.contrib.mysql\_repo\_configuration module
 feast.infra.online\_stores.contrib.pgvector\_repo\_configuration module
 -----------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.pgvector_repo_configuration
+.. automodule:: feast.infra.online_stores.pgvector_repo_configuration
    :members:
    :undoc-members:
    :show-inheritance:
@@ -100,7 +100,7 @@ feast.infra.online\_stores.contrib.pgvector\_repo\_configuration module
 feast.infra.online\_stores.contrib.postgres module
 --------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.postgres
+.. automodule:: feast.infra.online_stores.postgres_online_store
    :members:
    :undoc-members:
    :show-inheritance:
@@ -108,7 +108,7 @@ feast.infra.online\_stores.contrib.postgres module
 feast.infra.online\_stores.contrib.postgres\_repo\_configuration module
 -----------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.postgres_repo_configuration
+.. automodule:: feast.infra.online_stores.postgres_online_store.postgres_repo_configuration
    :members:
    :undoc-members:
    :show-inheritance:
@@ -116,7 +116,7 @@ feast.infra.online\_stores.contrib.postgres\_repo\_configuration module
 feast.infra.online\_stores.contrib.singlestore\_repo\_configuration module
 --------------------------------------------------------------------------
 
-.. automodule:: feast.infra.online_stores.contrib.singlestore_repo_configuration
+.. automodule:: feast.infra.online_stores.singlestore_repo_configuration
    :members:
    :undoc-members:
    :show-inheritance:
@@ -124,7 +124,7 @@ feast.infra.online\_stores.contrib.singlestore\_repo\_configuration module
 Module contents
 ---------------
 
-.. automodule:: feast.infra.online_stores.contrib
+.. automodule:: feast.infra.online_stores
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/sdk/python/docs/source/feast.infra.online_stores.rst b/sdk/python/docs/source/feast.infra.online_stores.rst
index 608e9fef6ae..ea714e45c5b 100644
--- a/sdk/python/docs/source/feast.infra.online_stores.rst
+++ b/sdk/python/docs/source/feast.infra.online_stores.rst
@@ -7,7 +7,7 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
-   feast.infra.online_stores.contrib
+   feast.infra.online_stores
 
 Submodules
 ----------
diff --git a/sdk/python/docs/source/index.rst b/sdk/python/docs/source/index.rst
index 86354f80c72..14af6a6d9ef 100644
--- a/sdk/python/docs/source/index.rst
+++ b/sdk/python/docs/source/index.rst
@@ -359,28 +359,28 @@ Snowflake Online Store
 PostgreSQL Online Store
 -----------------------
 
-.. autoclass:: feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStore
+.. autoclass:: feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStore
     :members:
 
-.. autoclass:: feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStoreConfig
+.. autoclass:: feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStoreConfig
     :members:
 
 HBase Online Store
 -----------------------
 
-.. autoclass:: feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStore
+.. autoclass:: feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore
     :members:
 
-.. autoclass:: feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStoreConfig
+.. autoclass:: feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStoreConfig
     :members:
 
 Cassandra Online Store
 -----------------------
 
-.. autoclass:: feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStore
+.. autoclass:: feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore
     :members:
 
-.. autoclass:: feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig
+.. autoclass:: feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStoreConfig
     :members:
 
 Batch Materialization Engine
diff --git a/sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/README.md b/sdk/python/feast/infra/online_stores/cassandra_online_store/README.md
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/README.md
rename to sdk/python/feast/infra/online_stores/cassandra_online_store/README.md
diff --git a/sdk/python/feast/infra/online_stores/contrib/__init__.py b/sdk/python/feast/infra/online_stores/cassandra_online_store/__init__.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/__init__.py
rename to sdk/python/feast/infra/online_stores/cassandra_online_store/__init__.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/cassandra_online_store.py b/sdk/python/feast/infra/online_stores/cassandra_online_store/cassandra_online_store.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/cassandra_online_store.py
rename to sdk/python/feast/infra/online_stores/cassandra_online_store/cassandra_online_store.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/cassandra_repo_configuration.py b/sdk/python/feast/infra/online_stores/cassandra_online_store/cassandra_repo_configuration.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/cassandra_repo_configuration.py
rename to sdk/python/feast/infra/online_stores/cassandra_online_store/cassandra_repo_configuration.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/couchbase_online_store/README.md b/sdk/python/feast/infra/online_stores/couchbase_online_store/README.md
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/couchbase_online_store/README.md
rename to sdk/python/feast/infra/online_stores/couchbase_online_store/README.md
diff --git a/sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/__init__.py b/sdk/python/feast/infra/online_stores/couchbase_online_store/__init__.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/cassandra_online_store/__init__.py
rename to sdk/python/feast/infra/online_stores/couchbase_online_store/__init__.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/couchbase_online_store/couchbase.py b/sdk/python/feast/infra/online_stores/couchbase_online_store/couchbase.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/couchbase_online_store/couchbase.py
rename to sdk/python/feast/infra/online_stores/couchbase_online_store/couchbase.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/couchbase_repo_configuration.py b/sdk/python/feast/infra/online_stores/couchbase_online_store/couchbase_repo_configuration.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/couchbase_repo_configuration.py
rename to sdk/python/feast/infra/online_stores/couchbase_online_store/couchbase_repo_configuration.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/couchbase_online_store/__init__.py b/sdk/python/feast/infra/online_stores/elasticsearch_online_store/__init__.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/couchbase_online_store/__init__.py
rename to sdk/python/feast/infra/online_stores/elasticsearch_online_store/__init__.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/elasticsearch.py b/sdk/python/feast/infra/online_stores/elasticsearch_online_store/elasticsearch.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/elasticsearch.py
rename to sdk/python/feast/infra/online_stores/elasticsearch_online_store/elasticsearch.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/elasticsearch_repo_configuration.py b/sdk/python/feast/infra/online_stores/elasticsearch_online_store/elasticsearch_repo_configuration.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/elasticsearch_repo_configuration.py
rename to sdk/python/feast/infra/online_stores/elasticsearch_online_store/elasticsearch_repo_configuration.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/faiss_online_store.py b/sdk/python/feast/infra/online_stores/faiss_online_store.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/faiss_online_store.py
rename to sdk/python/feast/infra/online_stores/faiss_online_store.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/README.md b/sdk/python/feast/infra/online_stores/hazelcast_online_store/README.md
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/README.md
rename to sdk/python/feast/infra/online_stores/hazelcast_online_store/README.md
diff --git a/sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/__init__.py b/sdk/python/feast/infra/online_stores/hazelcast_online_store/__init__.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/__init__.py
rename to sdk/python/feast/infra/online_stores/hazelcast_online_store/__init__.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/hazelcast_online_store.py b/sdk/python/feast/infra/online_stores/hazelcast_online_store/hazelcast_online_store.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/hazelcast_online_store/hazelcast_online_store.py
rename to sdk/python/feast/infra/online_stores/hazelcast_online_store/hazelcast_online_store.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/hazelcast_repo_configuration.py b/sdk/python/feast/infra/online_stores/hazelcast_online_store/hazelcast_repo_configuration.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/hazelcast_repo_configuration.py
rename to sdk/python/feast/infra/online_stores/hazelcast_online_store/hazelcast_repo_configuration.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/hbase_online_store/README.md b/sdk/python/feast/infra/online_stores/hbase_online_store/README.md
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/hbase_online_store/README.md
rename to sdk/python/feast/infra/online_stores/hbase_online_store/README.md
diff --git a/sdk/python/feast/infra/online_stores/contrib/hbase_online_store/__init__.py b/sdk/python/feast/infra/online_stores/hbase_online_store/__init__.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/hbase_online_store/__init__.py
rename to sdk/python/feast/infra/online_stores/hbase_online_store/__init__.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/hbase_online_store/hbase.py b/sdk/python/feast/infra/online_stores/hbase_online_store/hbase.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/hbase_online_store/hbase.py
rename to sdk/python/feast/infra/online_stores/hbase_online_store/hbase.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/hbase_repo_configuration.py b/sdk/python/feast/infra/online_stores/hbase_online_store/hbase_repo_configuration.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/hbase_repo_configuration.py
rename to sdk/python/feast/infra/online_stores/hbase_online_store/hbase_repo_configuration.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/ikv_online_store/__init__.py b/sdk/python/feast/infra/online_stores/ikv_online_store/__init__.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/ikv_online_store/__init__.py
rename to sdk/python/feast/infra/online_stores/ikv_online_store/__init__.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/ikv_online_store/ikv.py b/sdk/python/feast/infra/online_stores/ikv_online_store/ikv.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/ikv_online_store/ikv.py
rename to sdk/python/feast/infra/online_stores/ikv_online_store/ikv.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/mysql_online_store/README.md b/sdk/python/feast/infra/online_stores/mysql_online_store/README.md
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/mysql_online_store/README.md
rename to sdk/python/feast/infra/online_stores/mysql_online_store/README.md
diff --git a/sdk/python/feast/infra/online_stores/contrib/mysql_online_store/__init__.py b/sdk/python/feast/infra/online_stores/mysql_online_store/__init__.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/mysql_online_store/__init__.py
rename to sdk/python/feast/infra/online_stores/mysql_online_store/__init__.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/mysql_online_store/mysql.py b/sdk/python/feast/infra/online_stores/mysql_online_store/mysql.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/mysql_online_store/mysql.py
rename to sdk/python/feast/infra/online_stores/mysql_online_store/mysql.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/mysql_repo_configuration.py b/sdk/python/feast/infra/online_stores/mysql_online_store/mysql_repo_configuration.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/mysql_repo_configuration.py
rename to sdk/python/feast/infra/online_stores/mysql_online_store/mysql_repo_configuration.py
diff --git a/sdk/python/feast/infra/online_stores/postgres_online_store/__init__.py b/sdk/python/feast/infra/online_stores/postgres_online_store/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/sdk/python/feast/infra/online_stores/contrib/pgvector_repo_configuration.py b/sdk/python/feast/infra/online_stores/postgres_online_store/pgvector_repo_configuration.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/pgvector_repo_configuration.py
rename to sdk/python/feast/infra/online_stores/postgres_online_store/pgvector_repo_configuration.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/postgres.py b/sdk/python/feast/infra/online_stores/postgres_online_store/postgres.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/postgres.py
rename to sdk/python/feast/infra/online_stores/postgres_online_store/postgres.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/postgres_repo_configuration.py b/sdk/python/feast/infra/online_stores/postgres_online_store/postgres_repo_configuration.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/postgres_repo_configuration.py
rename to sdk/python/feast/infra/online_stores/postgres_online_store/postgres_repo_configuration.py
diff --git a/sdk/python/feast/infra/online_stores/qdrant_online_store/__init__.py b/sdk/python/feast/infra/online_stores/qdrant_online_store/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/sdk/python/feast/infra/online_stores/contrib/qdrant.py b/sdk/python/feast/infra/online_stores/qdrant_online_store/qdrant.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/qdrant.py
rename to sdk/python/feast/infra/online_stores/qdrant_online_store/qdrant.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/qdrant_repo_configuration.py b/sdk/python/feast/infra/online_stores/qdrant_online_store/qdrant_repo_configuration.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/qdrant_repo_configuration.py
rename to sdk/python/feast/infra/online_stores/qdrant_online_store/qdrant_repo_configuration.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/singlestore_online_store/singlestore.py b/sdk/python/feast/infra/online_stores/singlestore_online_store/singlestore.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/singlestore_online_store/singlestore.py
rename to sdk/python/feast/infra/online_stores/singlestore_online_store/singlestore.py
diff --git a/sdk/python/feast/infra/online_stores/contrib/singlestore_repo_configuration.py b/sdk/python/feast/infra/online_stores/singlestore_online_store/singlestore_repo_configuration.py
similarity index 100%
rename from sdk/python/feast/infra/online_stores/contrib/singlestore_repo_configuration.py
rename to sdk/python/feast/infra/online_stores/singlestore_online_store/singlestore_repo_configuration.py
diff --git a/sdk/python/feast/repo_config.py b/sdk/python/feast/repo_config.py
index 604915e7fae..185a8723ada 100644
--- a/sdk/python/feast/repo_config.py
+++ b/sdk/python/feast/repo_config.py
@@ -51,6 +51,18 @@
     "spark.engine": "feast.infra.materialization.contrib.spark.spark_materialization_engine.SparkMaterializationEngine",
 }
 
+LEGACY_ONLINE_STORE_CLASS_FOR_TYPE = {
+    "feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStore": "feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStore",
+    "feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStore": "feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore",
+    "feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStore": "feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore",
+    "feast.infra.online_stores.contrib.mysql_online_store.mysql.MySQLOnlineStore": "feast.infra.online_stores.mysql_online_store.mysql.MySQLOnlineStore",
+    "feast.infra.online_stores.contrib.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore": "feast.infra.online_stores.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore",
+    "feast.infra.online_stores.contrib.ikv_online_store.ikv.IKVOnlineStore": "feast.infra.online_stores.ikv_online_store.ikv.IKVOnlineStore",
+    "feast.infra.online_stores.contrib.elasticsearch.ElasticSearchOnlineStore": "feast.infra.online_stores.elasticsearch_online_store.ElasticSearchOnlineStore",
+    "feast.infra.online_stores.contrib.singlestore_online_store.singlestore.SingleStoreOnlineStore": "feast.infra.online_stores.singlestore_online_store.singlestore.SingleStoreOnlineStore",
+    "feast.infra.online_stores.contrib.qdrant.QdrantOnlineStore": "feast.infra.online_stores.cqdrant.QdrantOnlineStore",
+}
+
 ONLINE_STORE_CLASS_FOR_TYPE = {
     "sqlite": "feast.infra.online_stores.sqlite.SqliteOnlineStore",
     "datastore": "feast.infra.online_stores.datastore.DatastoreOnlineStore",
@@ -58,17 +70,18 @@
     "dynamodb": "feast.infra.online_stores.dynamodb.DynamoDBOnlineStore",
     "snowflake.online": "feast.infra.online_stores.snowflake.SnowflakeOnlineStore",
     "bigtable": "feast.infra.online_stores.bigtable.BigtableOnlineStore",
-    "postgres": "feast.infra.online_stores.contrib.postgres.PostgreSQLOnlineStore",
-    "hbase": "feast.infra.online_stores.contrib.hbase_online_store.hbase.HbaseOnlineStore",
-    "cassandra": "feast.infra.online_stores.contrib.cassandra_online_store.cassandra_online_store.CassandraOnlineStore",
-    "mysql": "feast.infra.online_stores.contrib.mysql_online_store.mysql.MySQLOnlineStore",
-    "hazelcast": "feast.infra.online_stores.contrib.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore",
-    "ikv": "feast.infra.online_stores.contrib.ikv_online_store.ikv.IKVOnlineStore",
-    "elasticsearch": "feast.infra.online_stores.contrib.elasticsearch.ElasticSearchOnlineStore",
+    "postgres": "feast.infra.online_stores.postgres_online_store.PostgreSQLOnlineStore",
+    "hbase": "feast.infra.online_stores.hbase_online_store.hbase.HbaseOnlineStore",
+    "cassandra": "feast.infra.online_stores.cassandra_online_store.cassandra_online_store.CassandraOnlineStore",
+    "mysql": "feast.infra.online_stores.mysql_online_store.mysql.MySQLOnlineStore",
+    "hazelcast": "feast.infra.online_stores.hazelcast_online_store.hazelcast_online_store.HazelcastOnlineStore",
+    "ikv": "feast.infra.online_stores.ikv_online_store.ikv.IKVOnlineStore",
+    "elasticsearch": "feast.infra.online_stores.elasticsearch_online_store.ElasticSearchOnlineStore",
     "remote": "feast.infra.online_stores.remote.RemoteOnlineStore",
-    "singlestore": "feast.infra.online_stores.contrib.singlestore_online_store.singlestore.SingleStoreOnlineStore",
-    "qdrant": "feast.infra.online_stores.contrib.qdrant.QdrantOnlineStore",
-    "couchbase": "feast.infra.online_stores.contrib.couchbase_online_store.couchbase.CouchbaseOnlineStore",
+    "singlestore": "feast.infra.online_stores.singlestore_online_store.singlestore.SingleStoreOnlineStore",
+    "qdrant": "feast.infra.online_stores.cqdrant.QdrantOnlineStore",
+    "couchbase": "feast.infra.online_stores.couchbase_online_store.couchbase.CouchbaseOnlineStore",
+    **LEGACY_ONLINE_STORE_CLASS_FOR_TYPE,
 }
 
 OFFLINE_STORE_CLASS_FOR_TYPE = {