diff --git a/src/domain/benutzer.rs b/src/domain/benutzer.rs
index 03fa54a..758c8f6 100644
--- a/src/domain/benutzer.rs
+++ b/src/domain/benutzer.rs
@@ -1,5 +1,6 @@
 pub mod dataloader;
 pub mod entity;
 pub mod model;
+pub mod queries;
 pub mod repository;
 pub mod service;
diff --git a/src/domain/benutzer/queries.rs b/src/domain/benutzer/queries.rs
new file mode 100644
index 0000000..4c39041
--- /dev/null
+++ b/src/domain/benutzer/queries.rs
@@ -0,0 +1 @@
+pub mod benutzer;
diff --git a/src/queries/benutzer.rs b/src/domain/benutzer/queries/benutzer.rs
similarity index 100%
rename from src/queries/benutzer.rs
rename to src/domain/benutzer/queries/benutzer.rs
diff --git a/src/domain/gruppe.rs b/src/domain/gruppe.rs
index 03fa54a..758c8f6 100644
--- a/src/domain/gruppe.rs
+++ b/src/domain/gruppe.rs
@@ -1,5 +1,6 @@
 pub mod dataloader;
 pub mod entity;
 pub mod model;
+pub mod queries;
 pub mod repository;
 pub mod service;
diff --git a/src/domain/gruppe/queries.rs b/src/domain/gruppe/queries.rs
new file mode 100644
index 0000000..5c58ccf
--- /dev/null
+++ b/src/domain/gruppe/queries.rs
@@ -0,0 +1 @@
+pub mod gruppe;
diff --git a/src/queries/gruppe.rs b/src/domain/gruppe/queries/gruppe.rs
similarity index 100%
rename from src/queries/gruppe.rs
rename to src/domain/gruppe/queries/gruppe.rs
diff --git a/src/domain/rolle.rs b/src/domain/rolle.rs
index 03fa54a..758c8f6 100644
--- a/src/domain/rolle.rs
+++ b/src/domain/rolle.rs
@@ -1,5 +1,6 @@
 pub mod dataloader;
 pub mod entity;
 pub mod model;
+pub mod queries;
 pub mod repository;
 pub mod service;
diff --git a/src/domain/rolle/queries.rs b/src/domain/rolle/queries.rs
new file mode 100644
index 0000000..6c5482c
--- /dev/null
+++ b/src/domain/rolle/queries.rs
@@ -0,0 +1 @@
+pub mod rolle;
diff --git a/src/queries/rolle.rs b/src/domain/rolle/queries/rolle.rs
similarity index 100%
rename from src/queries/rolle.rs
rename to src/domain/rolle/queries/rolle.rs
diff --git a/src/domain/typ.rs b/src/domain/typ.rs
index 03fa54a..758c8f6 100644
--- a/src/domain/typ.rs
+++ b/src/domain/typ.rs
@@ -1,5 +1,6 @@
 pub mod dataloader;
 pub mod entity;
 pub mod model;
+pub mod queries;
 pub mod repository;
 pub mod service;
diff --git a/src/domain/typ/queries.rs b/src/domain/typ/queries.rs
new file mode 100644
index 0000000..cf0929e
--- /dev/null
+++ b/src/domain/typ/queries.rs
@@ -0,0 +1 @@
+pub mod typ;
diff --git a/src/queries/typ.rs b/src/domain/typ/queries/typ.rs
similarity index 100%
rename from src/queries/typ.rs
rename to src/domain/typ/queries/typ.rs
diff --git a/src/queries/mod.rs b/src/queries/mod.rs
index b384ab7..a07e85e 100644
--- a/src/queries/mod.rs
+++ b/src/queries/mod.rs
@@ -1,18 +1,18 @@
-pub mod benutzer;
-pub mod gruppe;
 // pub mod hersteller;
 // pub mod modell;
-pub mod rolle;
-pub mod typ;
+use crate::domain::{
+    benutzer::queries::benutzer, gruppe::queries::gruppe, rolle::queries::rolle,
+    typ::queries::typ::TypQuery,
+};
 
 use async_graphql::MergedObject;
 
 #[derive(MergedObject, Default)]
 pub struct Query(
-    typ::TypQuery,
-    // modell::ModellQuery,
-    // hersteller::HerstellerQuery,
+    TypQuery,
     benutzer::BenutzerQuery,
     rolle::RolleQuery,
     gruppe::GruppeQuery,
+    // modell::ModellQuery,
+    // hersteller::HerstellerQuery,
 );