diff --git a/api/schema.js b/api/schema.js
deleted file mode 100644
index a3d6340..0000000
--- a/api/schema.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-const { GraphQLSchema } = require('graphql');
-const { MutationType } = require('./types/Mutation');
-const { QueryType } = require('./types/Query');
-
-exports.schema = new GraphQLSchema({
-  query: QueryType,
-  mutation: MutationType,
-});
diff --git a/api/types/File.js b/api/schema/FileType.js
similarity index 93%
rename from api/types/File.js
rename to api/schema/FileType.js
index 20db518..50430e6 100644
--- a/api/types/File.js
+++ b/api/schema/FileType.js
@@ -7,7 +7,7 @@ const {
   GraphQLID,
 } = require('graphql');
 
-exports.FileType = new GraphQLObjectType({
+module.exports = new GraphQLObjectType({
   name: 'File',
   description: 'A stored file.',
   fields: () => ({
diff --git a/api/types/Mutation.js b/api/schema/MutationType.js
similarity index 93%
rename from api/types/Mutation.js
rename to api/schema/MutationType.js
index 41dda54..c75cab1 100644
--- a/api/types/Mutation.js
+++ b/api/schema/MutationType.js
@@ -3,9 +3,9 @@
 const { GraphQLUpload } = require('apollo-server-koa');
 const { GraphQLList, GraphQLObjectType, GraphQLNonNull } = require('graphql');
 const promisesAll = require('promises-all');
-const { FileType } = require('./File');
+const FileType = require('./FileType');
 
-exports.MutationType = new GraphQLObjectType({
+module.exports = new GraphQLObjectType({
   name: 'Mutation',
   fields: () => ({
     singleUpload: {
diff --git a/api/types/Query.js b/api/schema/QueryType.js
similarity index 80%
rename from api/types/Query.js
rename to api/schema/QueryType.js
index 90c9455..6627197 100644
--- a/api/types/Query.js
+++ b/api/schema/QueryType.js
@@ -1,9 +1,9 @@
 'use strict';
 
 const { GraphQLList, GraphQLObjectType, GraphQLNonNull } = require('graphql');
-const { FileType } = require('./File');
+const FileType = require('./FileType');
 
-exports.QueryType = new GraphQLObjectType({
+module.exports = new GraphQLObjectType({
   name: 'Query',
   fields: () => ({
     uploads: {
diff --git a/api/schema/index.js b/api/schema/index.js
new file mode 100644
index 0000000..e443efb
--- /dev/null
+++ b/api/schema/index.js
@@ -0,0 +1,10 @@
+'use strict';
+
+const { GraphQLSchema } = require('graphql');
+const MutationType = require('./MutationType');
+const QueryType = require('./QueryType');
+
+module.exports = new GraphQLSchema({
+  query: QueryType,
+  mutation: MutationType,
+});
diff --git a/api/server.js b/api/server.js
index 69abc45..242f47e 100644
--- a/api/server.js
+++ b/api/server.js
@@ -7,7 +7,7 @@ const lowdb = require('lowdb');
 const FileSync = require('lowdb/adapters/FileSync');
 const mkdirp = require('mkdirp');
 const shortid = require('shortid');
-const { schema } = require('./schema');
+const schema = require('./schema');
 
 const UPLOAD_DIR = './uploads';
 const db = lowdb(new FileSync('db.json'));