diff --git a/client/package.json b/client/package.json
index 1762666af2..f8c41d8771 100644
--- a/client/package.json
+++ b/client/package.json
@@ -83,9 +83,10 @@
   ],
   "license": "MIT",
   "scripts": {
-    "prebuild": "npm run build:workers && node ../tools/scripts/build/ensure-env.js",
+    "prebuild": "echo 'Client workers building...' && npm run build:workers && echo 'Client workers ready.' && node ../tools/scripts/build/ensure-env.js",
     "build": "node --max_old_space_size=7168 node_modules/gatsby-cli build",
-    "build:workers": "node --max_old_space_size=7168 node_modules/webpack-cli --env.production --config ./webpack-workers.js --progress",
+    "build:workers": "node --max_old_space_size=7168 node_modules/webpack-cli --env.production --config ./webpack-workers.js && echo",
+    "build:workers:debug": "node --max_old_space_size=7168 node_modules/webpack-cli --env.production --config ./webpack-workers.js --progress",
     "clean": "gatsby clean",
     "predevelop": "npm run prebuild",
     "develop": "node --inspect=0.0.0.0:9228 node_modules/gatsby-cli develop",
diff --git a/lerna.json b/lerna.json
index 39f3e15229..c4146d15f0 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,7 +4,7 @@
     "client",
     "client/plugins/*",
     "curriculum",
-    "search-indexing",
+    "tools/search-indexing",
     "tools/challenge-md-parser",
     "tools/scripts/seed",
     "tools/scripts/build"
diff --git a/package.json b/package.json
index c4f91f7a8c..e4fd8208a2 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,6 @@
     "test": "npm-run-all -p test:*",
     "test:client": "cd ./client && npm test && cd ../",
     "test:curriculum": "cd ./curriculum && npm test && cd ../",
-    "test:guide-formatting": "node ./tools/scripts/ci/ensure-guide-formatting.js",
-    "test:search-indexing": "jest ./search-indexing",
     "test:server": "cd ./api-server && npm test && cd ../",
     "test:tools": "jest ./tools",
     "test:utils": "jest --rootDir ./utils"
diff --git a/search-indexing/algolia/index.js b/tools/search-indexing/algolia/index.js
similarity index 100%
rename from search-indexing/algolia/index.js
rename to tools/search-indexing/algolia/index.js
diff --git a/search-indexing/data-push/init/challenges.js b/tools/search-indexing/data-push/init/challenges.js
similarity index 100%
rename from search-indexing/data-push/init/challenges.js
rename to tools/search-indexing/data-push/init/challenges.js
diff --git a/search-indexing/data-push/init/guides.js b/tools/search-indexing/data-push/init/guides.js
similarity index 100%
rename from search-indexing/data-push/init/guides.js
rename to tools/search-indexing/data-push/init/guides.js
diff --git a/search-indexing/data-push/init/index.js b/tools/search-indexing/data-push/init/index.js
similarity index 100%
rename from search-indexing/data-push/init/index.js
rename to tools/search-indexing/data-push/init/index.js
diff --git a/search-indexing/data-push/init/youtube.js b/tools/search-indexing/data-push/init/youtube.js
similarity index 100%
rename from search-indexing/data-push/init/youtube.js
rename to tools/search-indexing/data-push/init/youtube.js
diff --git a/search-indexing/data-push/update/guides.js b/tools/search-indexing/data-push/update/guides.js
similarity index 100%
rename from search-indexing/data-push/update/guides.js
rename to tools/search-indexing/data-push/update/guides.js
diff --git a/search-indexing/data-sources/challenges/index.js b/tools/search-indexing/data-sources/challenges/index.js
similarity index 100%
rename from search-indexing/data-sources/challenges/index.js
rename to tools/search-indexing/data-sources/challenges/index.js
diff --git a/search-indexing/data-sources/guides/index.js b/tools/search-indexing/data-sources/guides/index.js
similarity index 100%
rename from search-indexing/data-sources/guides/index.js
rename to tools/search-indexing/data-sources/guides/index.js
diff --git a/search-indexing/data-sources/news/getAllPosts.js b/tools/search-indexing/data-sources/news/getAllPosts.js
similarity index 100%
rename from search-indexing/data-sources/news/getAllPosts.js
rename to tools/search-indexing/data-sources/news/getAllPosts.js
diff --git a/search-indexing/data-sources/youtube/index.js b/tools/search-indexing/data-sources/youtube/index.js
similarity index 100%
rename from search-indexing/data-sources/youtube/index.js
rename to tools/search-indexing/data-sources/youtube/index.js
diff --git a/search-indexing/package-lock.json b/tools/search-indexing/package-lock.json
similarity index 100%
rename from search-indexing/package-lock.json
rename to tools/search-indexing/package-lock.json
diff --git a/search-indexing/package.json b/tools/search-indexing/package.json
similarity index 100%
rename from search-indexing/package.json
rename to tools/search-indexing/package.json
diff --git a/search-indexing/utils/index.js b/tools/search-indexing/utils/index.js
similarity index 100%
rename from search-indexing/utils/index.js
rename to tools/search-indexing/utils/index.js
diff --git a/search-indexing/utils/tests/utils.test.js b/tools/search-indexing/utils/tests/utils.test.js
similarity index 100%
rename from search-indexing/utils/tests/utils.test.js
rename to tools/search-indexing/utils/tests/utils.test.js