diff --git a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/extensions/__init__.py b/stac_fastapi/core/stac_fastapi/core/extensions/__init__.py
similarity index 100%
rename from stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/extensions/__init__.py
rename to stac_fastapi/core/stac_fastapi/core/extensions/__init__.py
diff --git a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/extensions/filter.py b/stac_fastapi/core/stac_fastapi/core/extensions/filter.py
similarity index 100%
rename from stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/extensions/filter.py
rename to stac_fastapi/core/stac_fastapi/core/extensions/filter.py
diff --git a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/extensions/query.py b/stac_fastapi/core/stac_fastapi/core/extensions/query.py
similarity index 100%
rename from stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/extensions/query.py
rename to stac_fastapi/core/stac_fastapi/core/extensions/query.py
diff --git a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py
index 02cfefa1..ed812c46 100644
--- a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py
+++ b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py
@@ -9,11 +9,11 @@
 from elasticsearch_dsl import Q, Search
 
 from elasticsearch import exceptions, helpers  # type: ignore
+from stac_fastapi.core.extensions import filter
 from stac_fastapi.elasticsearch.config import AsyncElasticsearchSettings
 from stac_fastapi.elasticsearch.config import (
     ElasticsearchSettings as SyncElasticsearchSettings,
 )
-from stac_fastapi.elasticsearch.extensions import filter
 from stac_fastapi.elasticsearch.serializers import CollectionSerializer, ItemSerializer
 from stac_fastapi.types.errors import ConflictError, NotFoundError
 from stac_fastapi.types.stac import Collection, Item
diff --git a/stac_fastapi/elasticsearch/tests/conftest.py b/stac_fastapi/elasticsearch/tests/conftest.py
index 6d4a8b5e..49afa9bc 100644
--- a/stac_fastapi/elasticsearch/tests/conftest.py
+++ b/stac_fastapi/elasticsearch/tests/conftest.py
@@ -15,6 +15,7 @@
     CoreClient,
     TransactionsClient,
 )
+from stac_fastapi.core.extensions import QueryExtension
 from stac_fastapi.elasticsearch.config import (
     AsyncElasticsearchSettings,
     ElasticsearchSettings,
@@ -23,7 +24,6 @@
     DatabaseLogic,
     create_collection_index,
 )
-from stac_fastapi.elasticsearch.extensions import QueryExtension
 from stac_fastapi.extensions.core import (  # FieldsExtension,
     ContextExtension,
     FieldsExtension,