diff --git a/src/xquery/create-client.xq b/src/utils/xquery/create-client.xq
similarity index 100%
rename from src/xquery/create-client.xq
rename to src/utils/xquery/create-client.xq
diff --git a/src/xquery/d4s-gateways.xqm b/src/utils/xquery/d4s-gateways.xqm
similarity index 100%
rename from src/xquery/d4s-gateways.xqm
rename to src/utils/xquery/d4s-gateways.xqm
diff --git a/src/xquery/gateways.xq b/src/utils/xquery/gateways.xq
similarity index 100%
rename from src/xquery/gateways.xq
rename to src/utils/xquery/gateways.xq
diff --git a/src/xquery/keycloak-clients.xqm b/src/utils/xquery/keycloak-clients.xqm
similarity index 100%
rename from src/xquery/keycloak-clients.xqm
rename to src/utils/xquery/keycloak-clients.xqm