Merge pull request #18099 from vespa-engine/hmusum/move-to-schemas-dir

searchdefinitions -> schemas

76 files changed, 57 insertions, 13 deletions

diff --git a/application-preprocessor/src/test/resources/simple/searchdefinitions/music.sd b/application-preprocessor/src/test/resources/simple/schemas/music.sd
index c0190a4a7a8..c0190a4a7a8 100644
--- a/application-preprocessor/src/test/resources/simple/searchdefinitions/music.sd
+++ b/application-preprocessor/src/test/resources/simple/schemas/music.sd
diff --git a/application/src/test/app-packages/withcontent/searchdefinitions/mydoc.sd b/application/src/test/app-packages/withcontent/schemas/mydoc.sd
index 3a0b829d60c..3a0b829d60c 100644
--- a/application/src/test/app-packages/withcontent/searchdefinitions/mydoc.sd
+++ b/application/src/test/app-packages/withcontent/schemas/mydoc.sd
diff --git a/config-application-package/src/test/resources/app-pinning-major-version/searchdefinitions/music.sd b/config-application-package/src/test/resources/app-pinning-major-version/schemas/music.sd
index c0190a4a7a8..c0190a4a7a8 100644
--- a/config-application-package/src/test/resources/app-pinning-major-version/searchdefinitions/music.sd
+++ b/config-application-package/src/test/resources/app-pinning-major-version/schemas/music.sd
diff --git a/config-application-package/src/test/resources/app-with-deployment/searchdefinitions/music.sd b/config-application-package/src/test/resources/app-with-deployment/schemas/music.sd
index c0190a4a7a8..c0190a4a7a8 100644
--- a/config-application-package/src/test/resources/app-with-deployment/searchdefinitions/music.sd
+++ b/config-application-package/src/test/resources/app-with-deployment/schemas/music.sd
diff --git a/config-application-package/src/test/resources/multienvapp/searchdefinitions/music.sd b/config-application-package/src/test/resources/multienvapp/schemas/music.sd
index c0190a4a7a8..c0190a4a7a8 100644
--- a/config-application-package/src/test/resources/multienvapp/searchdefinitions/music.sd
+++ b/config-application-package/src/test/resources/multienvapp/schemas/music.sd
diff --git a/config-model/src/test/cfg/admin/metricconfig/searchdefinitions/music.sd b/config-model/src/test/cfg/admin/metricconfig/schemas/music.sd
index 32e8451d8e2..32e8451d8e2 100644
--- a/config-model/src/test/cfg/admin/metricconfig/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/admin/metricconfig/schemas/music.sd
diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/bar.expression b/config-model/src/test/cfg/application/app1/schemas/bar.expression
index eed496e6aeb..eed496e6aeb 100644
--- a/config-model/src/test/cfg/application/app1/searchdefinitions/bar.expression
+++ b/config-model/src/test/cfg/application/app1/schemas/bar.expression
diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/foo.expression b/config-model/src/test/cfg/application/app1/schemas/foo.expression
index ce26aa75dcb..ce26aa75dcb 100644
--- a/config-model/src/test/cfg/application/app1/searchdefinitions/foo.expression
+++ b/config-model/src/test/cfg/application/app1/schemas/foo.expression
diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/laptop.sd b/config-model/src/test/cfg/application/app1/schemas/laptop.sd
index 21a76ad605c..21a76ad605c 100644
--- a/config-model/src/test/cfg/application/app1/searchdefinitions/laptop.sd
+++ b/config-model/src/test/cfg/application/app1/schemas/laptop.sd
diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/music.sd b/config-model/src/test/cfg/application/app1/schemas/music.sd
index 693afbd308d..693afbd308d 100644
--- a/config-model/src/test/cfg/application/app1/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/application/app1/schemas/music.sd
diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/pc.sd b/config-model/src/test/cfg/application/app1/schemas/pc.sd
index bdc90328cdb..bdc90328cdb 100644
--- a/config-model/src/test/cfg/application/app1/searchdefinitions/pc.sd
+++ b/config-model/src/test/cfg/application/app1/schemas/pc.sd
diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/product.sd b/config-model/src/test/cfg/application/app1/schemas/product.sd
index 588a1d544c6..588a1d544c6 100644
--- a/config-model/src/test/cfg/application/app1/searchdefinitions/product.sd
+++ b/config-model/src/test/cfg/application/app1/schemas/product.sd
diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/sock.sd b/config-model/src/test/cfg/application/app1/schemas/sock.sd
index 9331c0caf54..9331c0caf54 100644
--- a/config-model/src/test/cfg/application/app1/searchdefinitions/sock.sd
+++ b/config-model/src/test/cfg/application/app1/schemas/sock.sd
diff --git a/config-model/src/test/cfg/application/app_complicated_deployment_spec/searchdefinitions/music.sd b/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd
index 693afbd308d..693afbd308d 100644
--- a/config-model/src/test/cfg/application/app_complicated_deployment_spec/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/application/app_complicated_deployment_spec/schemas/music.sd
diff --git a/config-model/src/test/cfg/application/app_genericservices/searchdefinitions/music.sd b/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd
index 693afbd308d..693afbd308d 100644
--- a/config-model/src/test/cfg/application/app_genericservices/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/application/app_genericservices/schemas/music.sd
diff --git a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mail.sd b/config-model/src/test/cfg/application/app_nohosts/schemas/mail.sd
index 8b6a6c44bf1..8b6a6c44bf1 100644
--- a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mail.sd
+++ b/config-model/src/test/cfg/application/app_nohosts/schemas/mail.sd
diff --git a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mailbox.sd b/config-model/src/test/cfg/application/app_nohosts/schemas/mailbox.sd
index f98017f401e..f98017f401e 100644
--- a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/mailbox.sd
+++ b/config-model/src/test/cfg/application/app_nohosts/schemas/mailbox.sd
diff --git a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/message.sd b/config-model/src/test/cfg/application/app_nohosts/schemas/message.sd
index 6c27917c656..6c27917c656 100644
--- a/config-model/src/test/cfg/application/app_nohosts/searchdefinitions/message.sd
+++ b/config-model/src/test/cfg/application/app_nohosts/schemas/message.sd
diff --git a/config-model/src/test/cfg/application/app_qrserverandgw/searchdefinitions/message.sd b/config-model/src/test/cfg/application/app_qrserverandgw/schemas/message.sd
index c09b2fb2da2..c09b2fb2da2 100644
--- a/config-model/src/test/cfg/application/app_qrserverandgw/searchdefinitions/message.sd
+++ b/config-model/src/test/cfg/application/app_qrserverandgw/schemas/message.sd
diff --git a/config-model/src/test/cfg/application/deprecated_features_app/hosts.xml b/config-model/src/test/cfg/application/deprecated_features_app/hosts.xml
new file mode 100644
index 00000000000..f0c76482b2f
--- /dev/null
+++ b/config-model/src/test/cfg/application/deprecated_features_app/hosts.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<hosts>
+  <host name="localhost">
+    <alias>node0</alias>
+  </host>
+</hosts>
diff --git a/config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd b/config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd
new file mode 100644
index 00000000000..c97c860a129
--- /dev/null
+++ b/config-model/src/test/cfg/application/deprecated_features_app/searchdefinitions/message.sd
@@ -0,0 +1,9 @@
+# Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+search message {
+
+  document message {
+    field foo type string {
+      indexing: summary
+    }
+  }
+}
diff --git a/config-model/src/test/cfg/application/deprecated_features_app/services.xml b/config-model/src/test/cfg/application/deprecated_features_app/services.xml
new file mode 100644
index 00000000000..daf03d0c4c3
--- /dev/null
+++ b/config-model/src/test/cfg/application/deprecated_features_app/services.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+
+<services version="1.0">
+
+  <admin version="2.0">
+    <adminserver hostalias="node0"/>
+  </admin>
+
+  <container version="1.0">
+    <nodes>
+      <node hostalias="node0"/>
+    </nodes>
+    <document-api/>
+    <search/>
+  </container>
+
+  <content version="1.0" id="message">
+    <redundancy>1</redundancy>
+    <documents>
+      <document type="message" mode="index"/>
+    </documents>
+      <nodes>
+        <node hostalias="node0" distribution-key="0" />
+      </nodes>
+  </content>
+
+</services>
diff --git a/config-model/src/test/cfg/application/sdfilenametest/searchdefinitions/notmusic.sd b/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd
index 77307c04843..77307c04843 100644
--- a/config-model/src/test/cfg/application/sdfilenametest/searchdefinitions/notmusic.sd
+++ b/config-model/src/test/cfg/application/sdfilenametest/schemas/notmusic.sd
diff --git a/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/ad.sd b/config-model/src/test/cfg/application/validation/document_references_validation/schemas/ad.sd
index 1e85ab70357..1e85ab70357 100644
--- a/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/ad.sd
+++ b/config-model/src/test/cfg/application/validation/document_references_validation/schemas/ad.sd
diff --git a/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/campaign.sd b/config-model/src/test/cfg/application/validation/document_references_validation/schemas/campaign.sd
index 9e208e397b9..9e208e397b9 100644
--- a/config-model/src/test/cfg/application/validation/document_references_validation/searchdefinitions/campaign.sd
+++ b/config-model/src/test/cfg/application/validation/document_references_validation/schemas/campaign.sd
diff --git a/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/parent.sd b/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/parent.sd
index 8decebc6680..8decebc6680 100644
--- a/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/parent.sd
+++ b/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/parent.sd
diff --git a/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/simple.sd
index b901fa6e82a..b901fa6e82a 100644
--- a/config-model/src/test/cfg/application/validation/global_distribution_validation/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/global_distribution_validation/schemas/simple.sd
diff --git a/config-model/src/test/cfg/application/validation/index_struct/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/index_struct/schemas/simple.sd
index a27a2d074d2..a27a2d074d2 100644
--- a/config-model/src/test/cfg/application/validation/index_struct/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/index_struct/schemas/simple.sd
diff --git a/config-model/src/test/cfg/application/validation/prefix/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/prefix/schemas/simple.sd
index 60ce940fd7d..60ce940fd7d 100644
--- a/config-model/src/test/cfg/application/validation/prefix/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/prefix/schemas/simple.sd
diff --git a/config-model/src/test/cfg/application/validation/prefix_index/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/prefix_index/schemas/simple.sd
index bf70a1662c6..bf70a1662c6 100644
--- a/config-model/src/test/cfg/application/validation/prefix_index/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/prefix_index/schemas/simple.sd
diff --git a/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/schemas/simple.sd
index 41412f4ef4f..41412f4ef4f 100644
--- a/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/prefix_index_and_attribute/schemas/simple.sd
diff --git a/config-model/src/test/cfg/application/validation/prefix_streaming/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/prefix_streaming/schemas/simple.sd
index bf70a1662c6..bf70a1662c6 100644
--- a/config-model/src/test/cfg/application/validation/prefix_streaming/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/prefix_streaming/schemas/simple.sd
diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_fail/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/ranking_constants_fail/schemas/simple.sd
index 8b782a01946..8b782a01946 100644
--- a/config-model/src/test/cfg/application/validation/ranking_constants_fail/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/ranking_constants_fail/schemas/simple.sd
diff --git a/config-model/src/test/cfg/application/validation/ranking_constants_ok/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/ranking_constants_ok/schemas/simple.sd
index 8b782a01946..8b782a01946 100644
--- a/config-model/src/test/cfg/application/validation/ranking_constants_ok/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/ranking_constants_ok/schemas/simple.sd
diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/parent.sd b/config-model/src/test/cfg/application/validation/search_alltypes/schemas/parent.sd
index 8decebc6680..8decebc6680 100644
--- a/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/parent.sd
+++ b/config-model/src/test/cfg/application/validation/search_alltypes/schemas/parent.sd
diff --git a/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/search_alltypes/schemas/simple.sd
index 242a7493df3..242a7493df3 100644
--- a/config-model/src/test/cfg/application/validation/search_alltypes/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/search_alltypes/schemas/simple.sd
diff --git a/config-model/src/test/cfg/application/validation/search_empty_content/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/search_empty_content/schemas/simple.sd
index 51512363fbc..51512363fbc 100644
--- a/config-model/src/test/cfg/application/validation/search_empty_content/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/search_empty_content/schemas/simple.sd
diff --git a/config-model/src/test/cfg/application/validation/search_struct/searchdefinitions/simple.sd b/config-model/src/test/cfg/application/validation/search_struct/schemas/simple.sd
index 0ab072111c5..0ab072111c5 100644
--- a/config-model/src/test/cfg/application/validation/search_struct/searchdefinitions/simple.sd
+++ b/config-model/src/test/cfg/application/validation/search_struct/schemas/simple.sd
diff --git a/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/mobile.sd b/config-model/src/test/cfg/routing/content_two_clusters/schemas/mobile.sd
index 3abc9238e8a..3abc9238e8a 100644
--- a/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/mobile.sd
+++ b/config-model/src/test/cfg/routing/content_two_clusters/schemas/mobile.sd
diff --git a/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/music.sd b/config-model/src/test/cfg/routing/content_two_clusters/schemas/music.sd
index da9e2d14c55..da9e2d14c55 100644
--- a/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/routing/content_two_clusters/schemas/music.sd
diff --git a/config-model/src/test/cfg/routing/contentsimpleconfig/searchdefinitions/music.sd b/config-model/src/test/cfg/routing/contentsimpleconfig/schemas/music.sd
index da9e2d14c55..da9e2d14c55 100644
--- a/config-model/src/test/cfg/routing/contentsimpleconfig/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/routing/contentsimpleconfig/schemas/music.sd
diff --git a/config-model/src/test/cfg/routing/replacehop/searchdefinitions/music.sd b/config-model/src/test/cfg/routing/replacehop/schemas/music.sd
index f9816d0d392..f9816d0d392 100755
--- a/config-model/src/test/cfg/routing/replacehop/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/routing/replacehop/schemas/music.sd
diff --git a/config-model/src/test/cfg/routing/replaceroute/searchdefinitions/music.sd b/config-model/src/test/cfg/routing/replaceroute/schemas/music.sd
index f9816d0d392..f9816d0d392 100755
--- a/config-model/src/test/cfg/routing/replaceroute/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/routing/replaceroute/schemas/music.sd
diff --git a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTData.sd b/config-model/src/test/cfg/search/data/travel/schemas/TTData.sd
index 67013239499..67013239499 100644
--- a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTData.sd
+++ b/config-model/src/test/cfg/search/data/travel/schemas/TTData.sd
diff --git a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd b/config-model/src/test/cfg/search/data/travel/schemas/TTEdge.sd
index e6707345235..e6707345235 100644
--- a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd
+++ b/config-model/src/test/cfg/search/data/travel/schemas/TTEdge.sd
diff --git a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd b/config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd
index c39ef03add5..c39ef03add5 100644
--- a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd
+++ b/config-model/src/test/cfg/search/data/travel/schemas/TTPOI.sd
diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/base.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/base.sd
index 22944f61997..22944f61997 100644
--- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/base.sd
+++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/base.sd
diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/left.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/left.sd
index c72b349bb4c..c72b349bb4c 100644
--- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/left.sd
+++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/left.sd
diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/music.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd
index da9e2d14c55..da9e2d14c55 100644
--- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/music.sd
diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/right.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/right.sd
index eb0a4cf8021..eb0a4cf8021 100644
--- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/right.sd
+++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/schemas/right.sd
diff --git a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/searchdefinitions/music.sd b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd
index da9e2d14c55..da9e2d14c55 100644
--- a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/schemas/music.sd
diff --git a/config-model/src/test/cfg/storage/clustercontroller_advanced/searchdefinitions/music.sd b/config-model/src/test/cfg/storage/clustercontroller_advanced/schemas/music.sd
index da9e2d14c55..da9e2d14c55 100644
--- a/config-model/src/test/cfg/storage/clustercontroller_advanced/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/storage/clustercontroller_advanced/schemas/music.sd
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index 75cb41be13f..e7622816603 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.fail;
 public class ApplicationDeployTest {
 
     private static final String TESTDIR = "src/test/cfg/application/";
-    private static final String TESTSDDIR = TESTDIR + "app1/searchdefinitions/";
+    private static final String TEST_SCHEMAS_DIR = TESTDIR + "app1/schemas/";
 
     @Rule
     public TemporaryFolder tmpFolder = new TemporaryFolder();
@@ -73,11 +73,11 @@ public class ApplicationDeployTest {
                     fail();
             }
         }
-        assertEquals(Set.of(new File(TESTSDDIR + "laptop.sd"),
-                            new File(TESTSDDIR + "music.sd"),
-                            new File(TESTSDDIR + "pc.sd"),
-                            new File(TESTSDDIR + "product.sd"),
-                            new File(TESTSDDIR + "sock.sd")),
+        assertEquals(Set.of(new File(TEST_SCHEMAS_DIR + "laptop.sd"),
+                            new File(TEST_SCHEMAS_DIR + "music.sd"),
+                            new File(TEST_SCHEMAS_DIR + "pc.sd"),
+                            new File(TEST_SCHEMAS_DIR + "product.sd"),
+                            new File(TEST_SCHEMAS_DIR + "sock.sd")),
                      new HashSet<>(tester.app().getSearchDefinitionFiles()));
 
         List<FilesApplicationPackage.Component> components = tester.app().getComponents();
diff --git a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java
index 91152648b10..8f9aa33ea52 100644
--- a/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/documentmodel/DocumentModelBuilderTestCase.java
@@ -49,9 +49,9 @@ public class DocumentModelBuilderTestCase extends SchemaTestCase {
     @Test
     public void testMultipleInheritanceArray() throws IOException, ParseException {
         SearchBuilder search = new SearchBuilder();
-        search.importFile("src/test/cfg/search/data/travel/searchdefinitions/TTData.sd");
-        search.importFile("src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd");
-        search.importFile("src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd");
+        search.importFile("src/test/cfg/search/data/travel/schemas/TTData.sd");
+        search.importFile("src/test/cfg/search/data/travel/schemas/TTEdge.sd");
+        search.importFile("src/test/cfg/search/data/travel/schemas/TTPOI.sd");
         search.build();
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index a3f7e973508..9eb7ca0ac02 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -306,9 +306,9 @@ public class VespaModelTestCase {
     }
 
     @Test
-    public void testThatDeployLogContainsWarninnWhenUsingSearchdefinitionsDir() throws IOException, SAXException {
+    public void testThatDeployLogContainsWarningWhenUsingSearchdefinitionsDir() throws IOException, SAXException {
         ApplicationPackage app = FilesApplicationPackage.fromFile(
-                new File("src/test/cfg/application/app_qrserverandgw/"));
+                new File("src/test/cfg/application/deprecated_features_app/"));
         MyLogger logger = new MyLogger();
         DeployState deployState = new DeployState.Builder()
                 .applicationPackage(app)
diff --git a/configserver/src/test/apps/app-jdisc-only-restart/searchdefinitions/music.sd b/configserver/src/test/apps/app-jdisc-only-restart/schemas/music.sd
index a2d4614c657..a2d4614c657 100644
--- a/configserver/src/test/apps/app-jdisc-only-restart/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/app-jdisc-only-restart/schemas/music.sd
diff --git a/configserver/src/test/apps/app-jdisc-only/searchdefinitions/music.sd b/configserver/src/test/apps/app-jdisc-only/schemas/music.sd
index a2d4614c657..a2d4614c657 100644
--- a/configserver/src/test/apps/app-jdisc-only/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/app-jdisc-only/schemas/music.sd
diff --git a/configserver/src/test/apps/app-major-version-2/searchdefinitions/music.sd b/configserver/src/test/apps/app-major-version-2/schemas/music.sd
index 7670e78f22b..7670e78f22b 100644
--- a/configserver/src/test/apps/app-major-version-2/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/app-major-version-2/schemas/music.sd
diff --git a/configserver/src/test/apps/app/searchdefinitions/music.sd b/configserver/src/test/apps/app/schemas/music.sd
index 7670e78f22b..7670e78f22b 100644
--- a/configserver/src/test/apps/app/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/app/schemas/music.sd
diff --git a/configserver/src/test/apps/hosted-no-write-access-control/searchdefinitions/music.sd b/configserver/src/test/apps/hosted-no-write-access-control/schemas/music.sd
index 78d58b27d4a..78d58b27d4a 100644
--- a/configserver/src/test/apps/hosted-no-write-access-control/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/hosted-no-write-access-control/schemas/music.sd
diff --git a/configserver/src/test/apps/hosted/searchdefinitions/music.sd b/configserver/src/test/apps/hosted/schemas/music.sd
index 78d58b27d4a..78d58b27d4a 100644
--- a/configserver/src/test/apps/hosted/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/hosted/schemas/music.sd
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/bar.expression b/configserver/src/test/apps/zkapp/schemas/bar.expression
index eed496e6aeb..eed496e6aeb 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/bar.expression
+++ b/configserver/src/test/apps/zkapp/schemas/bar.expression
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/foo.expression b/configserver/src/test/apps/zkapp/schemas/foo.expression
index ce26aa75dcb..ce26aa75dcb 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/foo.expression
+++ b/configserver/src/test/apps/zkapp/schemas/foo.expression
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/laptop.sd b/configserver/src/test/apps/zkapp/schemas/laptop.sd
index 21a76ad605c..21a76ad605c 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/laptop.sd
+++ b/configserver/src/test/apps/zkapp/schemas/laptop.sd
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/music.sd b/configserver/src/test/apps/zkapp/schemas/music.sd
index bdf4c060cf7..bdf4c060cf7 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/music.sd
+++ b/configserver/src/test/apps/zkapp/schemas/music.sd
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/pc.sd b/configserver/src/test/apps/zkapp/schemas/pc.sd
index bdc90328cdb..bdc90328cdb 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/pc.sd
+++ b/configserver/src/test/apps/zkapp/schemas/pc.sd
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/product.sd b/configserver/src/test/apps/zkapp/schemas/product.sd
index 588a1d544c6..588a1d544c6 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/product.sd
+++ b/configserver/src/test/apps/zkapp/schemas/product.sd
diff --git a/configserver/src/test/apps/zkapp/searchdefinitions/sock.sd b/configserver/src/test/apps/zkapp/schemas/sock.sd
index 9331c0caf54..9331c0caf54 100644
--- a/configserver/src/test/apps/zkapp/searchdefinitions/sock.sd
+++ b/configserver/src/test/apps/zkapp/schemas/sock.sd
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/bar.expression b/configserver/src/test/apps/zkfeed/schemas/bar.expression
index eed496e6aeb..eed496e6aeb 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/bar.expression
+++ b/configserver/src/test/apps/zkfeed/schemas/bar.expression
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/foo.expression b/configserver/src/test/apps/zkfeed/schemas/foo.expression
index ce26aa75dcb..ce26aa75dcb 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/foo.expression
+++ b/configserver/src/test/apps/zkfeed/schemas/foo.expression
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/laptop.sd b/configserver/src/test/apps/zkfeed/schemas/laptop.sd
index 21a76ad605c..21a76ad605c 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/laptop.sd
+++ b/configserver/src/test/apps/zkfeed/schemas/laptop.sd
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/pc.sd b/configserver/src/test/apps/zkfeed/schemas/pc.sd
index bdc90328cdb..bdc90328cdb 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/pc.sd
+++ b/configserver/src/test/apps/zkfeed/schemas/pc.sd
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/product.sd b/configserver/src/test/apps/zkfeed/schemas/product.sd
index 588a1d544c6..588a1d544c6 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/product.sd
+++ b/configserver/src/test/apps/zkfeed/schemas/product.sd
diff --git a/configserver/src/test/apps/zkfeed/searchdefinitions/sock.sd b/configserver/src/test/apps/zkfeed/schemas/sock.sd
index 9331c0caf54..9331c0caf54 100644
--- a/configserver/src/test/apps/zkfeed/searchdefinitions/sock.sd
+++ b/configserver/src/test/apps/zkfeed/schemas/sock.sd
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
index 016192e3281..2a18a1b2221 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStreamTest.java
@@ -141,9 +141,9 @@ public class CompressedApplicationInputStreamTest {
         assertTrue(files.contains(new File(outApp, "services.xml")));
         assertTrue(files.contains(new File(outApp, "hosts.xml")));
         assertTrue(files.contains(new File(outApp, "deployment.xml")));
-        assertTrue(files.contains(new File(outApp, "searchdefinitions")));
+        assertTrue(files.contains(new File(outApp, "schemas")));
         assertTrue(files.contains(new File(outApp, "external")));
-        File sd = files.get(files.indexOf(new File(outApp, "searchdefinitions")));
+        File sd = files.get(files.indexOf(new File(outApp, "schemas")));
         assertTrue(sd.isDirectory());
         assertThat(sd.listFiles().length, is(1));
         assertThat(sd.listFiles()[0].getAbsolutePath(), is(new File(sd, "keyvalue.sd").getAbsolutePath()));
diff --git a/configserver/src/test/resources/deploy/advancedapp/searchdefinitions/keyvalue.sd b/configserver/src/test/resources/deploy/advancedapp/schemas/keyvalue.sd
index 2d0f1ef0b75..2d0f1ef0b75 100644
--- a/configserver/src/test/resources/deploy/advancedapp/searchdefinitions/keyvalue.sd
+++ b/configserver/src/test/resources/deploy/advancedapp/schemas/keyvalue.sd