diff --git a/server/model-review/src/resolvers.js b/server/model-review/src/graphql.js
similarity index 62%
rename from server/model-review/src/resolvers.js
rename to server/model-review/src/graphql.js
index 566b16eb3abcee690d095bdb239c07bb5bcceaa0..8132e4874c53852c0c53c34a780a482c15c671d7 100644
--- a/server/model-review/src/resolvers.js
+++ b/server/model-review/src/graphql.js
@@ -60,4 +60,48 @@ const resolvers = {
   },
 }
 
-module.exports = resolvers
+const typeDefs = `
+  extend type Mutation {
+    updateReview(id: ID, input: ReviewInput): Review!
+    completeReview(id: ID!): TeamMember
+  }
+
+  type Review implements Object {
+    id: ID!
+    created: DateTime!
+    updated: DateTime
+    recommendation: String
+    isDecision: Boolean
+    open: Boolean
+    user: User
+    reviewComment: ReviewComment
+    confidentialComment: ReviewComment
+    decisionComment: ReviewComment
+  }
+
+  input ReviewInput {
+    reviewComment: ReviewCommentInput
+    confidentialComment: ReviewCommentInput
+    decisionComment: ReviewCommentInput
+    recommendation: String
+    isDecision: Boolean
+    manuscriptId: ID!
+  }
+
+  type ReviewComment implements Object {
+    id: ID!
+    created: DateTime!
+    updated: DateTime
+    commentType: String
+    content: String
+    files: [File]
+  }
+
+  input ReviewCommentInput {
+    id: ID
+    commentType: String
+    content: String
+  }
+`
+
+module.exports = { resolvers, typeDefs }
diff --git a/server/model-review/src/index.js b/server/model-review/src/index.js
index 92e1efbc087a696c0c6d9eb3cd9fe23701e00ff7..e1f1649b6d0f3fca4cb3f88484e7a0ff1e81069f 100644
--- a/server/model-review/src/index.js
+++ b/server/model-review/src/index.js
@@ -1,9 +1,7 @@
-const resolvers = require('./resolvers')
-const typeDefs = require('./typeDefs')
+const graphql = require('./graphql')
 
 module.exports = {
-  resolvers,
-  typeDefs,
+  ...graphql,
   models: [
     { modelName: 'Review', model: require('./review') },
     { modelName: 'ReviewComment', model: require('./review_comment') },
diff --git a/server/model-review/src/typeDefs.js b/server/model-review/src/typeDefs.js
deleted file mode 100644
index 43b7dc62d4336c86761581bfad24dc4739061f1f..0000000000000000000000000000000000000000
--- a/server/model-review/src/typeDefs.js
+++ /dev/null
@@ -1,45 +0,0 @@
-const typeDefs = `
-  extend type Mutation {
-    updateReview(id: ID, input: ReviewInput): Review!
-    completeReview(id: ID!): TeamMember
-  }
-
-  type Review implements Object {
-    id: ID!
-    created: DateTime!
-    updated: DateTime
-    recommendation: String
-    isDecision: Boolean
-    open: Boolean
-    user: User
-    reviewComment: ReviewComment
-    confidentialComment: ReviewComment
-    decisionComment: ReviewComment
-  }
-
-  input ReviewInput {
-    reviewComment: ReviewCommentInput
-    confidentialComment: ReviewCommentInput
-    decisionComment: ReviewCommentInput
-    recommendation: String
-    isDecision: Boolean
-    manuscriptId: ID!
-  }
-
-  type ReviewComment implements Object {
-    id: ID!
-    created: DateTime!
-    updated: DateTime
-    commentType: String
-    content: String
-    files: [File]
-  }
-
-  input ReviewCommentInput {
-    id: ID
-    commentType: String
-    content: String
-  }
-`
-
-module.exports = typeDefs