diff --git a/settings.gradle b/settings.gradle
index b6ccfa2..295185e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,7 @@
-rootProject.name = 'gaea.project'
+rootProject.name = 'greek.gaea'
 include 'src:gaea'
 findProject(':src:gaea')?.name = 'gaea'
 include 'src:gaea.app'
 findProject(':src:gaea.app')?.name = 'gaea.app'
 include 'src:gaea.mongo'
 findProject(':src:gaea.mongo')?.name = 'gaea.mongo'
-
diff --git a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/query/MongoQuery.kt b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/query/mongo/MongoQuery.kt
similarity index 96%
rename from src/gaea.mongo/src/main/kotlin/com/synebula/gaea/query/MongoQuery.kt
rename to src/gaea.mongo/src/main/kotlin/com/synebula/gaea/query/mongo/MongoQuery.kt
index 85206bf..9c5a2a5 100644
--- a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/query/MongoQuery.kt
+++ b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/query/mongo/MongoQuery.kt
@@ -1,5 +1,9 @@
-package com.synebula.gaea.query
+package com.synebula.gaea.query.mongo
 
+import com.synebula.gaea.query.IQuery
+import com.synebula.gaea.query.OrderType
+import com.synebula.gaea.query.PagingData
+import com.synebula.gaea.query.PagingParam
 import org.springframework.data.domain.Sort
 import org.springframework.data.mongodb.core.MongoTemplate
 import org.springframework.data.mongodb.core.query.Criteria
diff --git a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/repository/MongoRepository.kt b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/repository/mongo/MongoRepository.kt
similarity index 96%
rename from src/gaea.mongo/src/main/kotlin/com/synebula/gaea/repository/MongoRepository.kt
rename to src/gaea.mongo/src/main/kotlin/com/synebula/gaea/repository/mongo/MongoRepository.kt
index 9708666..cc50e3c 100644
--- a/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/repository/MongoRepository.kt
+++ b/src/gaea.mongo/src/main/kotlin/com/synebula/gaea/repository/mongo/MongoRepository.kt
@@ -1,4 +1,4 @@
-package com.synebula.gaea.repository
+package com.synebula.gaea.repository.mongo
 
 import com.synebula.gaea.domain.model.IAggregateRoot
 import com.synebula.gaea.domain.repository.ITypedRepository