diff --git a/graph2/graph.go b/graph2/graph.go
index 3df0d18..3ebefc9 100644
--- a/graph2/graph.go
+++ b/graph2/graph.go
@@ -2,7 +2,7 @@ package graph2
 
 import (
 	"git.aiterp.net/rpdata/api/graph2/graphcore"
-	"git.aiterp.net/rpdata/api/graph2/queries"
+	"git.aiterp.net/rpdata/api/graph2/resolvers"
 	"git.aiterp.net/rpdata/api/graph2/types"
 	"git.aiterp.net/rpdata/api/services"
 	graphql "github.com/99designs/gqlgen/graphql"
@@ -23,15 +23,15 @@ type rootResolver struct {
 }
 
 func (r *rootResolver) Query() graphcore.QueryResolver {
-	return queries.QueryResolver(r.s)
+	return resolvers.QueryResolver(r.s)
 }
 
 func (r *rootResolver) Mutation() graphcore.MutationResolver {
-	return queries.MutationResolver
+	return resolvers.MutationResolver
 }
 
 func (r *rootResolver) Subscription() graphcore.SubscriptionResolver {
-	return queries.SubscriptionResolver
+	return resolvers.SubscriptionResolver
 }
 
 func (r *rootResolver) Log() graphcore.LogResolver {
diff --git a/graph2/queries/changes.go b/graph2/resolvers/changes.go
similarity index 85%
rename from graph2/queries/changes.go
rename to graph2/resolvers/changes.go
index b06c075..d8379a4 100644
--- a/graph2/queries/changes.go
+++ b/graph2/resolvers/changes.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 
 /// Queries
 
-func (r *resolver) Changes(ctx context.Context, filter *changes.Filter) ([]*models.Change, error) {
+func (r *queryResolver) Changes(ctx context.Context, filter *changes.Filter) ([]*models.Change, error) {
 	changes, err := changes.List(filter)
 	if err != nil {
 		return nil, err
diff --git a/graph2/queries/channel.go b/graph2/resolvers/channel.go
similarity index 91%
rename from graph2/queries/channel.go
rename to graph2/resolvers/channel.go
index 86416e6..39b9304 100644
--- a/graph2/queries/channel.go
+++ b/graph2/resolvers/channel.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 
 // Queries
 
-func (r *resolver) Channel(ctx context.Context, name string) (*models.Channel, error) {
+func (r *queryResolver) Channel(ctx context.Context, name string) (*models.Channel, error) {
 	channel, err := channels.FindName(name)
 	if err != nil {
 		return nil, err
@@ -23,7 +23,7 @@ func (r *resolver) Channel(ctx context.Context, name string) (*models.Channel, e
 	return &channel, nil
 }
 
-func (r *resolver) Channels(ctx context.Context, filter *channels.Filter) ([]*models.Channel, error) {
+func (r *queryResolver) Channels(ctx context.Context, filter *channels.Filter) ([]*models.Channel, error) {
 	channels, err := channels.List(filter)
 	if err != nil {
 		return nil, err
diff --git a/graph2/queries/chapter.go b/graph2/resolvers/chapter.go
similarity index 97%
rename from graph2/queries/chapter.go
rename to graph2/resolvers/chapter.go
index 479cb5b..967a8d0 100644
--- a/graph2/queries/chapter.go
+++ b/graph2/resolvers/chapter.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -17,7 +17,7 @@ import (
 
 // Queries
 
-func (r *resolver) Chapter(ctx context.Context, id string) (*models.Chapter, error) {
+func (r *queryResolver) Chapter(ctx context.Context, id string) (*models.Chapter, error) {
 	chapter, err := chapters.FindID(id)
 	if err != nil {
 		return nil, err
diff --git a/graph2/queries/character.go b/graph2/resolvers/character.go
similarity index 95%
rename from graph2/queries/character.go
rename to graph2/resolvers/character.go
index 59c4884..4219770 100644
--- a/graph2/queries/character.go
+++ b/graph2/resolvers/character.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -16,7 +16,7 @@ import (
 
 // Queries
 
-func (r *resolver) Character(ctx context.Context, id *string, nick *string) (*models.Character, error) {
+func (r *queryResolver) Character(ctx context.Context, id *string, nick *string) (*models.Character, error) {
 	if id != nil {
 		character, err := characters.FindID(*id)
 		if err != nil {
@@ -36,7 +36,7 @@ func (r *resolver) Character(ctx context.Context, id *string, nick *string) (*mo
 	}
 }
 
-func (r *resolver) Characters(ctx context.Context, filter *characters.Filter) ([]*models.Character, error) {
+func (r *queryResolver) Characters(ctx context.Context, filter *characters.Filter) ([]*models.Character, error) {
 	characters, err := characters.List(filter)
 	if err != nil {
 		return nil, err
diff --git a/graph2/queries/comment.go b/graph2/resolvers/comment.go
similarity index 97%
rename from graph2/queries/comment.go
rename to graph2/resolvers/comment.go
index 65877ad..284f287 100644
--- a/graph2/queries/comment.go
+++ b/graph2/resolvers/comment.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -19,7 +19,7 @@ import (
 
 // Queries
 
-func (r *resolver) Comment(ctx context.Context, id string) (*models.Comment, error) {
+func (r *queryResolver) Comment(ctx context.Context, id string) (*models.Comment, error) {
 	comment, err := comments.Find(id)
 	if err != nil {
 		return nil, err
diff --git a/graph2/queries/file.go b/graph2/resolvers/file.go
similarity index 79%
rename from graph2/queries/file.go
rename to graph2/resolvers/file.go
index 054dc24..100b6f6 100644
--- a/graph2/queries/file.go
+++ b/graph2/resolvers/file.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 	"git.aiterp.net/rpdata/api/models/files"
 )
 
-func (r *resolver) File(ctx context.Context, id string) (*models.File, error) {
+func (r *queryResolver) File(ctx context.Context, id string) (*models.File, error) {
 	file, err := files.FindID(id)
 	if err != nil {
 		return nil, err
@@ -17,7 +17,7 @@ func (r *resolver) File(ctx context.Context, id string) (*models.File, error) {
 	return &file, nil
 }
 
-func (r *resolver) Files(ctx context.Context, filter *files.Filter) ([]*models.File, error) {
+func (r *queryResolver) Files(ctx context.Context, filter *files.Filter) ([]*models.File, error) {
 	token := auth.TokenFromContext(ctx)
 
 	if filter == nil {
diff --git a/graph2/queries/log.go b/graph2/resolvers/log.go
similarity index 96%
rename from graph2/queries/log.go
rename to graph2/resolvers/log.go
index 2fdcf1d..1fc5800 100644
--- a/graph2/queries/log.go
+++ b/graph2/resolvers/log.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -19,7 +19,7 @@ import (
 
 // Queries
 
-func (r *resolver) Log(ctx context.Context, id string) (*models.Log, error) {
+func (r *queryResolver) Log(ctx context.Context, id string) (*models.Log, error) {
 	log, err := logs.FindID(id)
 	if err != nil {
 		return nil, err
@@ -28,7 +28,7 @@ func (r *resolver) Log(ctx context.Context, id string) (*models.Log, error) {
 	return &log, nil
 }
 
-func (r *resolver) Logs(ctx context.Context, filter *logs.Filter) ([]*models.Log, error) {
+func (r *queryResolver) Logs(ctx context.Context, filter *logs.Filter) ([]*models.Log, error) {
 	logs, err := logs.List(filter)
 	if err != nil {
 		return nil, err
diff --git a/graph2/queries/post.go b/graph2/resolvers/post.go
similarity index 95%
rename from graph2/queries/post.go
rename to graph2/resolvers/post.go
index 7c208e4..840cd53 100644
--- a/graph2/queries/post.go
+++ b/graph2/resolvers/post.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -15,7 +15,7 @@ import (
 
 // Queries
 
-func (r *resolver) Post(ctx context.Context, id string) (*models.Post, error) {
+func (r *queryResolver) Post(ctx context.Context, id string) (*models.Post, error) {
 	post, err := posts.FindID(id)
 	if err != nil {
 		return nil, err
@@ -24,7 +24,7 @@ func (r *resolver) Post(ctx context.Context, id string) (*models.Post, error) {
 	return &post, nil
 }
 
-func (r *resolver) Posts(ctx context.Context, filter *posts.Filter) ([]*models.Post, error) {
+func (r *queryResolver) Posts(ctx context.Context, filter *posts.Filter) ([]*models.Post, error) {
 	// Some sanity checks to avoid querying an insame amount of posts.
 	if filter == nil {
 		filter = &posts.Filter{Limit: 256}
diff --git a/graph2/queries/resolver.go b/graph2/resolvers/resolvers.go
similarity index 82%
rename from graph2/queries/resolver.go
rename to graph2/resolvers/resolvers.go
index b672203..abff036 100644
--- a/graph2/queries/resolver.go
+++ b/graph2/resolvers/resolvers.go
@@ -1,17 +1,17 @@
-package queries
+package resolvers
 
 import (
 	"git.aiterp.net/rpdata/api/graph2/graphcore"
 	"git.aiterp.net/rpdata/api/services"
 )
 
-type resolver struct{ s *services.Bundle }
+type queryResolver struct{ s *services.Bundle }
 type mutationResolver struct{}
 type subscriptionResolver struct{}
 
 // QueryResolver has all the queries
 func QueryResolver(s *services.Bundle) graphcore.QueryResolver {
-	return &resolver{s: s}
+	return &queryResolver{s: s}
 }
 
 // MutationResolver brings the mutagens.
diff --git a/graph2/queries/story.go b/graph2/resolvers/story.go
similarity index 96%
rename from graph2/queries/story.go
rename to graph2/resolvers/story.go
index 147fc61..52da184 100644
--- a/graph2/queries/story.go
+++ b/graph2/resolvers/story.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"git.aiterp.net/rpdata/api/models/stories"
 )
 
-func (r *resolver) Story(ctx context.Context, id string) (*models.Story, error) {
+func (r *queryResolver) Story(ctx context.Context, id string) (*models.Story, error) {
 	story, err := stories.FindID(id)
 	if err != nil {
 		return nil, err
@@ -23,7 +23,7 @@ func (r *resolver) Story(ctx context.Context, id string) (*models.Story, error)
 	return &story, nil
 }
 
-func (r *resolver) Stories(ctx context.Context, filter *stories.Filter) ([]*models.Story, error) {
+func (r *queryResolver) Stories(ctx context.Context, filter *stories.Filter) ([]*models.Story, error) {
 	if filter != nil {
 		if filter.Unlisted != nil && *filter.Unlisted == true {
 			token := auth.TokenFromContext(ctx)
diff --git a/graph2/queries/tags.go b/graph2/resolvers/tags.go
similarity index 68%
rename from graph2/queries/tags.go
rename to graph2/resolvers/tags.go
index 411a6a3..bbf1fb1 100644
--- a/graph2/queries/tags.go
+++ b/graph2/resolvers/tags.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"git.aiterp.net/rpdata/api/models"
 )
 
-func (r *resolver) Tags(ctx context.Context, filter *graphcore.TagFilter) ([]*models.Tag, error) {
+func (r *queryResolver) Tags(ctx context.Context, filter *graphcore.TagFilter) ([]*models.Tag, error) {
 	tagFilter := models.TagFilter{}
 	if filter != nil && filter.Kind != nil {
 		tagFilter.Kind = filter.Kind
diff --git a/graph2/queries/token.go b/graph2/resolvers/token.go
similarity index 72%
rename from graph2/queries/token.go
rename to graph2/resolvers/token.go
index fbf1ebd..ed28edc 100644
--- a/graph2/queries/token.go
+++ b/graph2/resolvers/token.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 	"git.aiterp.net/rpdata/api/models"
 )
 
-func (r *resolver) Token(ctx context.Context) (*models.Token, error) {
+func (r *queryResolver) Token(ctx context.Context) (*models.Token, error) {
 	token := auth.TokenFromContext(ctx)
 	if !token.Authenticated() {
 		return nil, errors.New("No (valid) token")
diff --git a/graph2/queries/unknownnicks.go b/graph2/resolvers/unknownnicks.go
similarity index 75%
rename from graph2/queries/unknownnicks.go
rename to graph2/resolvers/unknownnicks.go
index 73c31b6..5f2c4a8 100644
--- a/graph2/queries/unknownnicks.go
+++ b/graph2/resolvers/unknownnicks.go
@@ -1,4 +1,4 @@
-package queries
+package resolvers
 
 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 
 /// Queries
 
-func (r *resolver) UnknownNicks(ctx context.Context, filter *graphcore.UnknownNicksFilter) ([]*models.UnknownNick, error) {
+func (r *queryResolver) UnknownNicks(ctx context.Context, filter *graphcore.UnknownNicksFilter) ([]*models.UnknownNick, error) {
 	limit := 100
 	if filter != nil {
 		if filter.Limit > 0 {