diff --git a/src/main/resources/query/get-catalogue-virtual-service.json b/src/main/resources/query/01-get-catalogue-virtual-service.json
similarity index 100%
rename from src/main/resources/query/get-catalogue-virtual-service.json
rename to src/main/resources/query/01-get-catalogue-virtual-service.json
diff --git a/src/main/resources/query/get-gcat-configuration.json b/src/main/resources/query/02-get-gcat-configuration.json
similarity index 100%
rename from src/main/resources/query/get-gcat-configuration.json
rename to src/main/resources/query/02-get-gcat-configuration.json
diff --git a/src/main/resources/query/get-simple-facet-from-configuration.json b/src/main/resources/query/03-get-simple-facet-of-gcat-configuration.json
similarity index 100%
rename from src/main/resources/query/get-simple-facet-from-configuration.json
rename to src/main/resources/query/03-get-simple-facet-of-gcat-configuration.json
diff --git a/src/main/resources/query/get-ckan-service.json b/src/main/resources/query/04-get-ckan-service.json
similarity index 100%
rename from src/main/resources/query/get-ckan-service.json
rename to src/main/resources/query/04-get-ckan-service.json
diff --git a/src/main/resources/query/get-access-point-facet-of-ckan-service.json b/src/main/resources/query/05-get-access-point-facet-of-ckan-service.json
similarity index 100%
rename from src/main/resources/query/get-access-point-facet-of-ckan-service.json
rename to src/main/resources/query/05-get-access-point-facet-of-ckan-service.json
diff --git a/src/main/resources/query/get-ckan-db.json b/src/main/resources/query/06-get-postgres-ckan-db.json
similarity index 100%
rename from src/main/resources/query/get-ckan-db.json
rename to src/main/resources/query/06-get-postgres-ckan-db.json
diff --git a/src/main/resources/query/get-access-point-facet-of-ckan-db.json b/src/main/resources/query/07-get-access-point-facet-of-postgres-ckan-db.json
similarity index 100%
rename from src/main/resources/query/get-access-point-facet-of-ckan-db.json
rename to src/main/resources/query/07-get-access-point-facet-of-postgres-ckan-db.json
diff --git a/src/main/resources/query/get-solr-service.json b/src/main/resources/query/08-get-solr-service.json
similarity index 100%
rename from src/main/resources/query/get-solr-service.json
rename to src/main/resources/query/08-get-solr-service.json
diff --git a/src/main/resources/query/get-access-point-facet-of-solr-service.json b/src/main/resources/query/09-get-access-point-facet-of-solr-service.json
similarity index 100%
rename from src/main/resources/query/get-access-point-facet-of-solr-service.json
rename to src/main/resources/query/09-get-access-point-facet-of-solr-service.json