diff --git a/server/src/schema/index.js b/server/src/schema/index.js
index 8ef7decda..4155e4999 100644
--- a/server/src/schema/index.js
+++ b/server/src/schema/index.js
@@ -1,34 +1,9 @@
 import {
-  GraphQLObjectType,
   GraphQLSchema
 } from 'graphql'
 
-import {
-  HostCompetitionMutation,
-  RegisterToCompetitionMutation
-} from './mutations'
-import {
-  CompetitionsQuery,
-  CompetitionsByHostQuery,
-  CompetitionsByDevTeamQuery
-} from './queries'
-
-const RootQuery = new GraphQLObjectType({
-  name: 'RootQueryType',
-  fields: Object.assign(
-    CompetitionsQuery,
-    CompetitionsByHostQuery,
-    CompetitionsByDevTeamQuery
-  )
-})
-
-const Mutation = new GraphQLObjectType({
-  name: 'Mutation',
-  fields: Object.assign(
-    HostCompetitionMutation,
-    RegisterToCompetitionMutation
-  )
-})
+import Mutation from './mutations'
+import RootQuery from './queries'
 
 const Schema = new GraphQLSchema({
   query: RootQuery,
diff --git a/server/src/schema/mutations/index.js b/server/src/schema/mutations/index.js
index e8b9045d4..372c2c3a6 100644
--- a/server/src/schema/mutations/index.js
+++ b/server/src/schema/mutations/index.js
@@ -1,7 +1,16 @@
+import {
+  GraphQLObjectType
+} from 'graphql'
+
 import HostCompetitionMutation from './HostCompetition'
 import RegisterToCompetitionMutation from './RegisterToCompetition'
 
-export {
-  HostCompetitionMutation,
-  RegisterToCompetitionMutation
-}
+const Mutation = new GraphQLObjectType({
+  name: 'Mutation',
+  fields: Object.assign(
+    HostCompetitionMutation,
+    RegisterToCompetitionMutation
+  )
+})
+
+export default Mutation
diff --git a/server/src/schema/queries/index.js b/server/src/schema/queries/index.js
index 07e3b56bd..58a55bec3 100644
--- a/server/src/schema/queries/index.js
+++ b/server/src/schema/queries/index.js
@@ -1,9 +1,18 @@
+import {
+  GraphQLObjectType
+} from 'graphql'
+
 import CompetitionsQuery from './Competitions'
 import CompetitionsByHostQuery from './CompetitionsByHost'
 import CompetitionsByDevTeamQuery from './CompetitionsByDevTeam'
 
-export {
-  CompetitionsQuery,
-  CompetitionsByHostQuery,
-  CompetitionsByDevTeamQuery
-}
+const RootQuery = new GraphQLObjectType({
+  name: 'RootQueryType',
+  fields: Object.assign(
+    CompetitionsQuery,
+    CompetitionsByHostQuery,
+    CompetitionsByDevTeamQuery
+  )
+})
+
+export default RootQuery