diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/mutation/AccountMutation.kt b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt
similarity index 91%
rename from src/main/kotlin/com/cubetiqs/graphql/demo/mutation/AccountMutation.kt
rename to src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt
index a4497fc..125f0fc 100644
--- a/src/main/kotlin/com/cubetiqs/graphql/demo/mutation/AccountMutation.kt
+++ b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt
@@ -1,4 +1,4 @@
-package com.cubetiqs.graphql.demo.mutation
+package com.cubetiqs.graphql.demo.resolver.mutation
 
 import com.cubetiqs.graphql.demo.context.GMutation
 import com.cubetiqs.graphql.demo.domain.account.Account
@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Propagation
 import org.springframework.transaction.annotation.Transactional
 
 @GMutation
-class AccountMutation @Autowired constructor(
+class AccountMutationResolver @Autowired constructor(
     private val accountRepository: AccountRepository,
     private val userRepository: UserRepository,
 ) : GraphQLMutationResolver {
diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/mutation/UserMutation.kt b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt
similarity index 89%
rename from src/main/kotlin/com/cubetiqs/graphql/demo/mutation/UserMutation.kt
rename to src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt
index 32ce2a7..ba8c042 100644
--- a/src/main/kotlin/com/cubetiqs/graphql/demo/mutation/UserMutation.kt
+++ b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt
@@ -1,4 +1,4 @@
-package com.cubetiqs.graphql.demo.mutation
+package com.cubetiqs.graphql.demo.resolver.mutation
 
 import com.cubetiqs.graphql.demo.context.GMutation
 import com.cubetiqs.graphql.demo.domain.user.User
@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Propagation
 import org.springframework.transaction.annotation.Transactional
 
 @GMutation
-class UserMutation @Autowired constructor(
+class UserMutationResolver @Autowired constructor(
     private val userRepository: UserRepository,
 ) : GraphQLMutationResolver {
     @Transactional(propagation = Propagation.REQUIRES_NEW)
diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/query/AccountQuery.kt b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt
similarity index 85%
rename from src/main/kotlin/com/cubetiqs/graphql/demo/query/AccountQuery.kt
rename to src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt
index 767c907..701bcdc 100644
--- a/src/main/kotlin/com/cubetiqs/graphql/demo/query/AccountQuery.kt
+++ b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt
@@ -1,4 +1,4 @@
-package com.cubetiqs.graphql.demo.query
+package com.cubetiqs.graphql.demo.resolver.query
 
 import com.cubetiqs.graphql.demo.context.GQuery
 import com.cubetiqs.graphql.demo.domain.account.Account
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.data.domain.Pageable
 
 @GQuery
-class AccountQuery @Autowired constructor(
+class AccountQueryResolver @Autowired constructor(
     private val accountRepository: AccountRepository,
 ) : GraphQLQueryResolver {
     fun fetchAccounts(): Collection<Account> {
diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/query/HelloQuery.kt b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/HelloQueryResolver.kt
similarity index 74%
rename from src/main/kotlin/com/cubetiqs/graphql/demo/query/HelloQuery.kt
rename to src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/HelloQueryResolver.kt
index 8078c49..57cd12a 100644
--- a/src/main/kotlin/com/cubetiqs/graphql/demo/query/HelloQuery.kt
+++ b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/HelloQueryResolver.kt
@@ -1,4 +1,4 @@
-package com.cubetiqs.graphql.demo.query
+package com.cubetiqs.graphql.demo.resolver.query
 
 import com.cubetiqs.graphql.demo.context.GQuery
 import graphql.kickstart.tools.GraphQLQueryResolver
@@ -6,7 +6,7 @@ import reactor.core.publisher.Mono
 import java.util.concurrent.CompletableFuture
 
 @GQuery
-class HelloQuery : GraphQLQueryResolver {
+class HelloQueryResolver : GraphQLQueryResolver {
     fun hello(): CompletableFuture<String> {
         return Mono.just("Hello Query...!").toFuture()
     }
diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/query/UserQuery.kt b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt
similarity index 85%
rename from src/main/kotlin/com/cubetiqs/graphql/demo/query/UserQuery.kt
rename to src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt
index 9e1db81..dbf0cc4 100644
--- a/src/main/kotlin/com/cubetiqs/graphql/demo/query/UserQuery.kt
+++ b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt
@@ -1,4 +1,4 @@
-package com.cubetiqs.graphql.demo.query
+package com.cubetiqs.graphql.demo.resolver.query
 
 import com.cubetiqs.graphql.demo.context.GQuery
 import com.cubetiqs.graphql.demo.domain.user.User
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.data.domain.Pageable
 
 @GQuery
-class UserQuery @Autowired constructor(
+class UserQueryResolver @Autowired constructor(
     private val userRepository: UserRepository,
 ) : GraphQLQueryResolver {
     fun fetchUsers(): Collection<User> {
diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/HelloSubscriptionResolver.kt b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/subscription/HelloSubscriptionResolver.kt
similarity index 89%
rename from src/main/kotlin/com/cubetiqs/graphql/demo/resolver/HelloSubscriptionResolver.kt
rename to src/main/kotlin/com/cubetiqs/graphql/demo/resolver/subscription/HelloSubscriptionResolver.kt
index 53f6479..089faf2 100644
--- a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/HelloSubscriptionResolver.kt
+++ b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/subscription/HelloSubscriptionResolver.kt
@@ -1,4 +1,4 @@
-package com.cubetiqs.graphql.demo.resolver
+package com.cubetiqs.graphql.demo.resolver.subscription
 
 import graphql.kickstart.tools.GraphQLSubscriptionResolver
 import graphql.schema.DataFetchingEnvironment