diff --git a/gatsby-node.ts b/gatsby-node.ts
index dcf634af31..d3abb16f36 100644
--- a/gatsby-node.ts
+++ b/gatsby-node.ts
@@ -1,12 +1,9 @@
 import { GatsbyNode } from "gatsby"
 import * as path from "path"
-import { promisify } from "util"
-import { readFile } from "fs/promises"
 import * as globby from "globby"
-import * as frontmatterParser from "parser-front-matter"
-import { sortLibs } from "./scripts/sort-libraries/sort-libraries"
-
-const parse$ = promisify(frontmatterParser.parse)
+import { updateCodeData } from "./scripts/update-code-data/update-code-data"
+import { organizeCodeData } from "./scripts/update-code-data/organize-code-data"
+import { sortCodeData } from "./scripts/update-code-data/sort-code-data"
 
 export const createSchemaCustomization: GatsbyNode["createSchemaCustomization"] =
   async ({ actions }) => {
@@ -85,15 +82,10 @@ export const onCreatePage: GatsbyNode["onCreatePage"] = async ({
   page,
   actions,
 }) => {
-  // trying to refactor code to be "the Gatsby way".
-  // from the paths on ready, ignores a bunch of existing custom logic below.
-  if (page.path.startsWith("/blog")) {
-    return
-  }
-  if (page.path.startsWith("/tags")) {
+  // This way is not "the Gatsby way", we create the pages, delete the pages, and create "code" paths page again.
+  if (page.path.startsWith("/blog") || page.path.startsWith("/tags")) {
     return
   }
-
   const { createPage, deletePage } = actions
   deletePage(page)
   let context = {
@@ -102,144 +94,14 @@ export const onCreatePage: GatsbyNode["onCreatePage"] = async ({
   }
   if (page.path === "/code" || page.path === "/code/") {
     const markdownFilePaths = await globby("src/content/code/**/*.md")
-    const codeData: any = {}
     const slugMap = require("./src/content/code/slug-map.json")
-    await Promise.all(
-      markdownFilePaths.map(async markdownFilePath => {
-        const markdownFileContent = await readFile(markdownFilePath, "utf-8")
-        let {
-          data: { name, description, url, github, npm, gem },
-          content: howto,
-        } = await parse$(markdownFileContent)
-        howto = howto.trim()
-        const pathArr = markdownFilePath.split("/")
-        if (markdownFilePath.includes("language-support")) {
-          const languageSupportDirIndex = pathArr.indexOf("language-support")
-          const languageNameSlugIndex = languageSupportDirIndex + 1
-          const languageNameSlug = pathArr[languageNameSlugIndex]
-          const languageName = slugMap[languageNameSlug]
-          codeData.Languages ||= {}
-          codeData.Languages[languageName] ||= {}
-
-          const categoryNameSlugIndex = languageSupportDirIndex + 2
-          const categoryNameSlug = pathArr[categoryNameSlugIndex]
-          const categoryName = slugMap[categoryNameSlug]
-          codeData.Languages[languageName][categoryName] ||= []
-          codeData.Languages[languageName][categoryName].push({
-            name,
-            description,
-            howto,
-            url,
-            github,
-            npm,
-            gem,
-            sourcePath: markdownFilePath,
-          })
-        } else if (markdownFilePath.includes("tools")) {
-          const toolSupportDirIndex = pathArr.indexOf("tools")
-          const toolNameSlugIndex = toolSupportDirIndex + 1
-          const toolNameSlug = pathArr[toolNameSlugIndex]
-          const toolName = slugMap[toolNameSlug]
-          codeData.ToolsNew ||= {}
-          codeData.ToolsNew[toolName] ||= {}
-          const categoryToolsNameSlugIndex = toolSupportDirIndex + 2
-          const categoryToolsNameSlug = pathArr[categoryToolsNameSlugIndex]
-          const categoryToolsName = slugMap[categoryToolsNameSlug]
-          codeData.ToolsNew[toolName][categoryToolsName] ||= []
-
-          codeData.ToolsNew[toolName][categoryToolsName].push({
-            name,
-            description,
-            howto,
-            url,
-            github,
-            npm,
-            gem,
-            sourcePath: markdownFilePath,
-          })
-        } else {
-          const codeDirIndex = pathArr.indexOf("code")
-          const categoryNameSlugIndex = codeDirIndex + 1
-          const categoryNameSlug = pathArr[categoryNameSlugIndex]
-          const categoryName = slugMap[categoryNameSlug]
-          codeData[categoryName] ||= []
-          codeData[categoryName].push({
-            name,
-            description,
-            howto,
-            url,
-            github,
-            npm,
-            gem,
-            sourcePath: markdownFilePath,
-          })
-        }
-      })
-    )
-    const languageList: any = []
-    const toolList: any = []
-    await Promise.all([
-      ...Object.keys(codeData.Languages).map(async languageName => {
-        const libraryCategoryMap = codeData.Languages[languageName]
-        let languageTotalStars = 0
-        await Promise.all(
-          Object.keys(libraryCategoryMap).map(async libraryCategoryName => {
-            const libraries = libraryCategoryMap[libraryCategoryName]
-            const { sortedLibs, totalStars } = await sortLibs(libraries)
-
-            libraryCategoryMap[libraryCategoryName] = sortedLibs
-            languageTotalStars += totalStars || 0
-          })
-        )
-        languageList.push({
-          name: languageName,
-          totalStars: languageTotalStars,
-          categoryMap: libraryCategoryMap,
-        })
-      }),
-      ...Object.keys(codeData.ToolsNew).map(async toolName => {
-        const toolCategoryMap = codeData.ToolsNew[toolName]
-        let toolTotalStars = 0
-        await Promise.all(
-          Object.keys(toolCategoryMap).map(async toolCategoryName => {
-            const tools = toolCategoryMap[toolCategoryName]
-            const { sortedLibs, totalStars } = await sortLibs(tools)
-            toolCategoryMap[toolCategoryName] = sortedLibs
-            toolTotalStars += totalStars || 0
-          })
-        )
-        toolList.push({
-          name: toolName,
-          totalStars: toolTotalStars,
-          categoryMap: toolCategoryMap,
-        })
-      }),
-    ])
+    const codeData = await updateCodeData(markdownFilePaths, slugMap)
+    const organizeData = await organizeCodeData(codeData)
+    const sortedOrganizeData = await sortCodeData(organizeData)
 
     context = {
-      ...context,
-      otherLibraries: {
-        Services: codeData.Services,
-        "More Stuff": codeData["More Stuff"],
-      },
-      languageList: languageList.sort((a, b) => {
-        if (a.totalStars > b.totalStars) {
-          return -1
-        }
-        if (a.totalStars < b.totalStars) {
-          return 1
-        }
-        return 0
-      }),
-      toolList: toolList.sort((a, b) => {
-        if (a.totalStars > b.totalStars) {
-          return -1
-        }
-        if (a.totalStars < b.totalStars) {
-          return 1
-        }
-        return 0
-      }),
+      sourcePath: path.relative(__dirname, page.path),
+      ...sortedOrganizeData,
     }
   }
   createPage({
diff --git a/scripts/sort-libraries/sort-libraries.ts b/scripts/sort-libraries/sort-libraries.ts
index 4c297856ca..378c9637da 100644
--- a/scripts/sort-libraries/sort-libraries.ts
+++ b/scripts/sort-libraries/sort-libraries.ts
@@ -3,12 +3,12 @@ import { getGitHubStats } from "./get-github-stats"
 import { getHttpScore } from "./get-http-score"
 import { getNpmStats } from "./get-npm-stats"
 
-interface Library {
+export interface Library {
   name: string
   description: string
   howto: string
   url: string
-  github: string
+  github: string | undefined
   npm: string | undefined
   gem: string | undefined
   sourcePath: string
diff --git a/scripts/update-code-data/organize-code-data.ts b/scripts/update-code-data/organize-code-data.ts
new file mode 100644
index 0000000000..c5962eeabb
--- /dev/null
+++ b/scripts/update-code-data/organize-code-data.ts
@@ -0,0 +1,57 @@
+import { Library, sortLibs } from "../sort-libraries/sort-libraries"
+import { CodeData } from "./update-code-data"
+
+export type List = {
+  name: string
+  totalStars: number
+  categoryMap: {
+    [categoryName: string]: Library[]
+  }
+}
+
+export async function organizeCodeData(
+  codeData: CodeData
+): Promise<{ languageList: List[]; toolList: List[]; serviceList: Library[] }> {
+  let languageList: List[] = []
+  let toolList: List[] = []
+  let serviceList: Library[] = []
+  await Promise.all([
+    ...Object.keys(codeData.Languages).map(async languageName => {
+      const libraryCategoryMap = codeData.Languages[languageName]
+      let languageTotalStars = 0
+      await Promise.all(
+        Object.keys(libraryCategoryMap).map(async libraryCategoryName => {
+          const libraries = libraryCategoryMap[libraryCategoryName]
+          const { sortedLibs, totalStars } = await sortLibs(libraries)
+
+          libraryCategoryMap[libraryCategoryName] = sortedLibs
+          languageTotalStars += totalStars || 0
+        })
+      )
+      languageList.push({
+        name: languageName,
+        totalStars: languageTotalStars,
+        categoryMap: libraryCategoryMap,
+      })
+    }),
+    ...Object.keys(codeData.Tools).map(async toolName => {
+      const toolCategoryMap = codeData.Tools[toolName]
+      let toolTotalStars = 0
+      await Promise.all(
+        Object.keys(toolCategoryMap).map(async toolCategoryName => {
+          const tools = toolCategoryMap[toolCategoryName]
+          const { sortedLibs, totalStars } = await sortLibs(tools)
+          toolCategoryMap[toolCategoryName] = sortedLibs
+          toolTotalStars += totalStars || 0
+        })
+      )
+      toolList.push({
+        name: toolName,
+        totalStars: toolTotalStars,
+        categoryMap: toolCategoryMap,
+      })
+    }),
+    (serviceList = codeData.Services),
+  ])
+  return { languageList, toolList, serviceList }
+}
diff --git a/scripts/update-code-data/sort-code-data.ts b/scripts/update-code-data/sort-code-data.ts
new file mode 100644
index 0000000000..503dff273f
--- /dev/null
+++ b/scripts/update-code-data/sort-code-data.ts
@@ -0,0 +1,35 @@
+import { Library } from "../sort-libraries/sort-libraries"
+import { List } from "./organize-code-data"
+
+type organizeData = {
+  languageList: List[]
+  toolList: List[]
+  serviceList: Library[]
+}
+
+export async function sortCodeData(
+  organizeData: organizeData
+): Promise<organizeData> {
+  await Promise.all([
+    organizeData.languageList.sort((a, b) => {
+      if (a.totalStars > b.totalStars) {
+        return -1
+      }
+      if (a.totalStars < b.totalStars) {
+        return 1
+      }
+      return 0
+    }),
+    organizeData.toolList.sort((a, b) => {
+      if (a.totalStars > b.totalStars) {
+        return -1
+      }
+      if (a.totalStars < b.totalStars) {
+        return 1
+      }
+      return 0
+    }),
+    organizeData.serviceList,
+  ])
+  return organizeData
+}
diff --git a/scripts/update-code-data/update-code-data.ts b/scripts/update-code-data/update-code-data.ts
new file mode 100644
index 0000000000..f1e9aec09b
--- /dev/null
+++ b/scripts/update-code-data/update-code-data.ts
@@ -0,0 +1,109 @@
+import { readFile } from "fs/promises"
+import { promisify } from "util"
+import * as frontmatterParser from "parser-front-matter"
+import { Library } from "../sort-libraries/sort-libraries"
+
+const parse$ = promisify(frontmatterParser.parse)
+
+export type CodeData = {
+  Languages: {
+    [languageName: string]: {
+      [categoryName: string]: Library[]
+    }
+  }
+  Tools: {
+    [toolName: string]: {
+      [categoryToolsName: string]: Library[]
+    }
+  }
+  Services: Library[]
+}
+
+export async function updateCodeData(
+  markdownFilePaths: string[],
+  slugMap: string
+): Promise<CodeData> {
+  let codeData = {} as CodeData
+  await Promise.all(
+    markdownFilePaths.map(async markdownFilePath => {
+      const markdownFileContent = await readFile(markdownFilePath, "utf-8")
+      let {
+        data: { name, description, url, github, npm, gem },
+        content: howto,
+      } = await parse$(markdownFileContent)
+      howto = howto.trim()
+      const pathArr = markdownFilePath.split("/")
+      const languageSupport = markdownFilePath.includes("language-support")
+      const toolsSupport = markdownFilePath.includes("tools")
+
+      switch (true) {
+        case languageSupport: {
+          const languageSupportDirIndex = pathArr.indexOf("language-support")
+          const languageNameSlugIndex = languageSupportDirIndex + 1
+          const languageNameSlug = pathArr[languageNameSlugIndex]
+          const languageName = slugMap[languageNameSlug]
+          codeData.Languages ||= {}
+          codeData.Languages[languageName] ||= {}
+
+          const categoryNameSlugIndex = languageSupportDirIndex + 2
+          const categoryNameSlug = pathArr[categoryNameSlugIndex]
+          const categoryName = slugMap[categoryNameSlug]
+          codeData.Languages[languageName][categoryName] ||= []
+          codeData.Languages[languageName][categoryName].push({
+            name,
+            description,
+            howto,
+            url,
+            github,
+            npm,
+            gem,
+            sourcePath: markdownFilePath,
+          })
+          break
+        }
+        case toolsSupport: {
+          const toolSupportDirIndex = pathArr.indexOf("tools")
+          const toolNameSlugIndex = toolSupportDirIndex + 1
+          const toolNameSlug = pathArr[toolNameSlugIndex]
+          const toolName = slugMap[toolNameSlug]
+          codeData.Tools ||= {}
+          codeData.Tools[toolName] ||= {}
+          const categoryToolsNameSlugIndex = toolSupportDirIndex + 2
+          const categoryToolsNameSlug = pathArr[categoryToolsNameSlugIndex]
+          const categoryToolsName = slugMap[categoryToolsNameSlug]
+          codeData.Tools[toolName][categoryToolsName] ||= []
+
+          codeData.Tools[toolName][categoryToolsName].push({
+            name,
+            description,
+            howto,
+            url,
+            github,
+            npm,
+            gem,
+            sourcePath: markdownFilePath,
+          })
+          break
+        }
+        default: {
+          const codeDirIndex = pathArr.indexOf("code")
+          const categoryNameSlugIndex = codeDirIndex + 1
+          const categoryNameSlug = pathArr[categoryNameSlugIndex]
+          const categoryName = slugMap[categoryNameSlug]
+          codeData[categoryName] ||= []
+          codeData[categoryName].push({
+            name,
+            description,
+            howto,
+            url,
+            github,
+            npm,
+            gem,
+            sourcePath: markdownFilePath,
+          })
+        }
+      }
+    })
+  )
+  return codeData
+}
diff --git a/src/pages/code.tsx b/src/pages/code.tsx
index 2af271ab02..c3999a85af 100644
--- a/src/pages/code.tsx
+++ b/src/pages/code.tsx
@@ -6,7 +6,7 @@ import Marked from "../components/Marked"
 import Seo from "../components/Seo"
 import { toSlug } from "../utils/slug"
 
-interface ILibrary {
+export interface ILibrary {
   description: string
   github?: string
   npm?: string
@@ -39,14 +39,10 @@ interface Tool {
     General: ILibrary[]
   }
 }
-
 interface PageContext {
   languageList: Language[]
   toolList: Tool[]
-  otherLibraries: {
-    Services: ILibrary[]
-    Tools?: ILibrary[]
-  }
+  serviceList: ILibrary[]
   sourcePath: string
 }
 
@@ -351,7 +347,7 @@ export default ({ pageContext }: PageProps<{}, PageContext>) => {
                 #
               </AnchorLink>
             </h2>
-            <LibraryList data={pageContext.otherLibraries?.Services ?? []} />
+            <LibraryList data={pageContext.serviceList} />
           </div>
         </div>
         <p>