diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0eff44ea75..704fd0ba5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed `product/loadConfigurableAttributes` calls - @andrzejewsky, @gibkigonzo (#3336)
 - Disable `mapFallback` url by default - @gibkigonzo(#4092)
 - Include token in pricing sync -  @carlokok (#4156)
+- Move 'graphql' search adapter from core to src (deprecated) - @gibkigonzo (#4214)
 
 ## [1.11.2] - 2020.03.10
 
diff --git a/src/search/adapter/.gitkeep b/src/search/adapter/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core/lib/search/adapter/graphql/gqlQuery.js b/src/search/adapter/graphql/gqlQuery.js
similarity index 100%
rename from core/lib/search/adapter/graphql/gqlQuery.js
rename to src/search/adapter/graphql/gqlQuery.js
diff --git a/core/lib/search/adapter/graphql/processor/processType.ts b/src/search/adapter/graphql/processor/processType.ts
similarity index 100%
rename from core/lib/search/adapter/graphql/processor/processType.ts
rename to src/search/adapter/graphql/processor/processType.ts
diff --git a/core/lib/search/adapter/graphql/queries/categories.gql b/src/search/adapter/graphql/queries/categories.gql
similarity index 100%
rename from core/lib/search/adapter/graphql/queries/categories.gql
rename to src/search/adapter/graphql/queries/categories.gql
diff --git a/core/lib/search/adapter/graphql/queries/cmsBlock.gql b/src/search/adapter/graphql/queries/cmsBlock.gql
similarity index 100%
rename from core/lib/search/adapter/graphql/queries/cmsBlock.gql
rename to src/search/adapter/graphql/queries/cmsBlock.gql
diff --git a/core/lib/search/adapter/graphql/queries/cmsHierarchy.gql b/src/search/adapter/graphql/queries/cmsHierarchy.gql
similarity index 100%
rename from core/lib/search/adapter/graphql/queries/cmsHierarchy.gql
rename to src/search/adapter/graphql/queries/cmsHierarchy.gql
diff --git a/core/lib/search/adapter/graphql/queries/cmsPage.gql b/src/search/adapter/graphql/queries/cmsPage.gql
similarity index 100%
rename from core/lib/search/adapter/graphql/queries/cmsPage.gql
rename to src/search/adapter/graphql/queries/cmsPage.gql
diff --git a/core/lib/search/adapter/graphql/queries/customAttributeMetadata.gql b/src/search/adapter/graphql/queries/customAttributeMetadata.gql
similarity index 100%
rename from core/lib/search/adapter/graphql/queries/customAttributeMetadata.gql
rename to src/search/adapter/graphql/queries/customAttributeMetadata.gql
diff --git a/core/lib/search/adapter/graphql/queries/products.gql b/src/search/adapter/graphql/queries/products.gql
similarity index 100%
rename from core/lib/search/adapter/graphql/queries/products.gql
rename to src/search/adapter/graphql/queries/products.gql
diff --git a/core/lib/search/adapter/graphql/queries/reviews.gql b/src/search/adapter/graphql/queries/reviews.gql
similarity index 100%
rename from core/lib/search/adapter/graphql/queries/reviews.gql
rename to src/search/adapter/graphql/queries/reviews.gql
diff --git a/core/lib/search/adapter/graphql/queries/taxrule.gql b/src/search/adapter/graphql/queries/taxrule.gql
similarity index 100%
rename from core/lib/search/adapter/graphql/queries/taxrule.gql
rename to src/search/adapter/graphql/queries/taxrule.gql
diff --git a/core/lib/search/adapter/graphql/searchAdapter.ts b/src/search/adapter/graphql/searchAdapter.ts
similarity index 99%
rename from core/lib/search/adapter/graphql/searchAdapter.ts
rename to src/search/adapter/graphql/searchAdapter.ts
index 9a6b1141a8..704b8eb2fe 100644
--- a/core/lib/search/adapter/graphql/searchAdapter.ts
+++ b/src/search/adapter/graphql/searchAdapter.ts
@@ -1,5 +1,5 @@
 import { prepareQueryVars } from './gqlQuery'
-import { currentStoreView, prepareStoreView } from '../../../multistore'
+import { currentStoreView, prepareStoreView } from '@vue-storefront/core/lib/multistore'
 import fetch from 'isomorphic-fetch'
 import {processESResponseType, processProductsType, processCmsType} from './processor/processType'
 import { SearchQuery } from 'storefront-query-builder'