diff --git a/gatsby-node.js b/gatsby-node.js
index 1e4c534..7a1404e 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -7,8 +7,8 @@ const {
   resolveToArray,
   resolveSlug,
   resolveSoftwareTools,
-} = require('./gatsbyutils/gatsby-resolver-utils')
-const { DATASET_PATH } = require('./gatsbyutils/constants')
+} = require('./gatsby/utils/gatsby-resolver-utils')
+const { DATASET_PATH } = require('./gatsby/constants')
 
 const read = (p) => fs.readFileSync(path.join(__dirname, p), 'utf8')
 
@@ -21,9 +21,9 @@ const read = (p) => fs.readFileSync(path.join(__dirname, p), 'utf8')
 const DATA_ONLY_PAGES = ["software", "dataset", "allenite", "program"];
 
 exports.createSchemaCustomization = ({ actions, schema }) => {
-  const { createTypes } = actions
-  const typeDefs = [
-    `"""
+    const { createTypes } = actions;
+    const typeDefs = [
+        `"""
         Nested materials and methods block for idea posts.
         """
         type MaterialsAndMethods {
@@ -49,10 +49,10 @@ exports.createSchemaCustomization = ({ actions, schema }) => {
             softwareTool: MarkdownRemark @link(by: "fields.slug")
             customDescription: String
         }`,
-  ]
-  createTypes(read('gatsby/schema/base.gql'))
-  createTypes(typeDefs)
-}
+    ];
+    createTypes(read("gatsby/schema/base.gql"));
+    createTypes(typeDefs);
+};
 
 /**
  * Resolvers ensure data shape/presence after queries, or provide
diff --git a/gatsbyutils/constants.js b/gatsby/constants.js
similarity index 100%
rename from gatsbyutils/constants.js
rename to gatsby/constants.js
diff --git a/gatsbyutils/gatsby-resolver-utils.js b/gatsby/utils/gatsby-resolver-utils.js
similarity index 97%
rename from gatsbyutils/gatsby-resolver-utils.js
rename to gatsby/utils/gatsby-resolver-utils.js
index b8f8434..a0f9949 100644
--- a/gatsbyutils/gatsby-resolver-utils.js
+++ b/gatsby/utils/gatsby-resolver-utils.js
@@ -1,4 +1,4 @@
-const { SOFTWARE_PATH } = require("../gatsbyutils/constants");
+const { SOFTWARE_PATH } = require("../constants");
 const slugify = require("slugify");
 
 /**
diff --git a/gatsbyutils/test/gatsby-resolver-utils.test.js b/gatsby/utils/test/gatsby-resolver-utils.test.js
similarity index 100%
rename from gatsbyutils/test/gatsby-resolver-utils.test.js
rename to gatsby/utils/test/gatsby-resolver-utils.test.js