diff --git a/.gitmodules b/.gitmodules
index 696341067..106e765ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "src/monad-ext"]
 	path = src/monad-ext
 	url = https://msostc.visualstudio.com/DefaultCollection/PS/_git/monad-ext
-[submodule "src/monad_app_base"]
-	path = src/monad_app_base
-	url = https://msostc.visualstudio.com/DefaultCollection/PS/_git/monad_app_base
 [submodule "ext-src/pester"]
 	path = ext-src/pester
 	url = mshttps://msostc.visualstudio.com/DefaultCollection/PS/_git/Pester
diff --git a/scripts/Makefile b/scripts/Makefile
index ec2b77f36..9f5234320 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -145,7 +145,11 @@ prepare:
 internal-prepare-exec_env: runps.sh
 	rm -rf exec_env
 	mkdir exec_env
-	cp -r ../src/monad_app_base/app_base exec_env
+	mkdir exec_env/app_base
+	mkdir exec_env/app_base/Modules
+	cp ../src/monad/monad/miscfiles/display/*.ps1xml exec_env/app_base
+	cp ../src/monad/monad/miscfiles/types/CoreClr/*.ps1xml exec_env/app_base
+	cp -r ../src/monad/monad/miscfiles/modules/* exec_env/app_base/Modules
 	cp -r dotnetlibs/*.dll exec_env/app_base
 	cp -r dotnetlibs/*.exe exec_env/app_base
 	cp -r dotnetlibs/lib* exec_env/app_base
diff --git a/src/monad_app_base b/src/monad_app_base
deleted file mode 160000
index a96ff8d98..000000000
--- a/src/monad_app_base
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a96ff8d9874f562b247d207da2c944e1ebb79cb3