diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 200164d7b..ce60111fa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -778,7 +778,7 @@ file( GLOB HEADER_FILES
 	sound/*.h
 	textures/*.h
 	scripting/*.h
-	scripting/codegeneration/*.h
+	scripting/backend/*.h
 	scripting/decorate/*.h
 	scripting/zscript/*.h
 	scripting/vm/*.h
@@ -1197,14 +1197,14 @@ set (PCH_SOURCES
 	scripting/thingdef.cpp
 	scripting/thingdef_data.cpp
 	scripting/thingdef_properties.cpp
-	scripting/codegeneration/codegen.cpp
-	scripting/codegeneration/dynarrays.cpp
+	scripting/backend/codegen.cpp
+	scripting/backend/dynarrays.cpp
+	scripting/backend/vmbuilder.cpp
+	scripting/backend/vmdisasm.cpp
 	scripting/decorate/olddecorations.cpp
 	scripting/decorate/thingdef_exp.cpp
 	scripting/decorate/thingdef_parse.cpp
 	scripting/decorate/thingdef_states.cpp
-	scripting/vm/vmbuilder.cpp
-	scripting/vm/vmdisasm.cpp
 	scripting/vm/vmexec.cpp
 	scripting/vm/vmframe.cpp
 	scripting/zscript/ast.cpp
@@ -1421,9 +1421,9 @@ source_group("Platforms\\OS X Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE
 source_group("Platforms\\Unix Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/unix/.+")
 source_group("Platforms\\SDL Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/sdl/.+")
 source_group("Platforms\\Win32 Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/win32/.+")
-source_group("Scripting\\Decorate" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/decorate/.+")
-source_group("Scripting\\ZScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/zscript/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.c ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.h)
-source_group("Scripting\\Code Generation" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/codegeneration/.+")
+source_group("Scripting\\Decorate frontend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/decorate/.+")
+source_group("Scripting\\ZScript frontend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/zscript/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.c ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.h)
+source_group("Scripting\\Compiler backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/backend/.+")
 source_group("Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/vm/.+")
 source_group("Scripting" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/.+")
 source_group("Shared Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_shared/.+")
diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp
index 7fecec550..7ad5e6344 100644
--- a/src/d_dehacked.cpp
+++ b/src/d_dehacked.cpp
@@ -73,7 +73,7 @@
 #include "thingdef.h"
 #include "info.h"
 #include "v_text.h"
-#include "vmbuilder.h"
+#include "backend/vmbuilder.h"
 
 // [SO] Just the way Randy said to do it :)
 // [RH] Made this CVAR_SERVERINFO
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 573c19071..e91c2ccaa 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -2717,7 +2717,7 @@ void D_DoomMain (void)
 
 		GC::FullGC();					// clean up before taking down the object list.
 
-		// Delete the VM functions here. The garbage collector will not do this automatically because they are referenced from the global action function definitions.
+		// Delete the reference to the VM functions here which were deleted and will be recreated after the restart.
 		FAutoSegIterator probe(ARegHead, ARegTail);
 		while (*++probe != NULL)
 		{
diff --git a/src/dobjgc.cpp b/src/dobjgc.cpp
index 5b6a34bdc..ca57e6aca 100644
--- a/src/dobjgc.cpp
+++ b/src/dobjgc.cpp
@@ -783,7 +783,7 @@ CCMD(gc)
 	else if (stricmp(argv[1], "count") == 0)
 	{
 		int cnt = 0;
-		for (DObject *obj = GC::Root; obj; obj = obj->ObjNext, cnt++)
+		for (DObject *obj = GC::Root; obj; obj = obj->ObjNext, cnt++);
 		Printf("%d active objects counted\n", cnt);
 	}
 	else if (stricmp(argv[1], "pause") == 0)
diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp
index 6dc4483a0..c39e316a7 100644
--- a/src/dobjtype.cpp
+++ b/src/dobjtype.cpp
@@ -3877,11 +3877,7 @@ IMPLEMENT_POINTERS_START(PSymbolType)
 	IMPLEMENT_POINTER(Type)
 IMPLEMENT_POINTERS_END
 
-IMPLEMENT_CLASS(PSymbolVMFunction, false, true)
-
-IMPLEMENT_POINTERS_START(PSymbolVMFunction)
-	IMPLEMENT_POINTER(Function)
-IMPLEMENT_POINTERS_END
+IMPLEMENT_CLASS(PSymbolVMFunction, false, false)
 
 //==========================================================================
 //
diff --git a/src/dobjtype.h b/src/dobjtype.h
index 3858585e9..6fd2f9b1d 100644
--- a/src/dobjtype.h
+++ b/src/dobjtype.h
@@ -84,7 +84,6 @@ struct FNamespaceManager;
 class PSymbolVMFunction : public PSymbol
 {
 	DECLARE_CLASS(PSymbolVMFunction, PSymbol);
-	HAS_OBJECT_POINTERS;
 public:
 	VMFunction *Function;
 
diff --git a/src/scripting/codegeneration/codegen.cpp b/src/scripting/backend/codegen.cpp
similarity index 100%
rename from src/scripting/codegeneration/codegen.cpp
rename to src/scripting/backend/codegen.cpp
diff --git a/src/scripting/codegeneration/codegen.h b/src/scripting/backend/codegen.h
similarity index 100%
rename from src/scripting/codegeneration/codegen.h
rename to src/scripting/backend/codegen.h
diff --git a/src/scripting/codegeneration/dynarrays.cpp b/src/scripting/backend/dynarrays.cpp
similarity index 100%
rename from src/scripting/codegeneration/dynarrays.cpp
rename to src/scripting/backend/dynarrays.cpp
diff --git a/src/scripting/vm/vmbuilder.cpp b/src/scripting/backend/vmbuilder.cpp
similarity index 99%
rename from src/scripting/vm/vmbuilder.cpp
rename to src/scripting/backend/vmbuilder.cpp
index 19fe81c32..74f845248 100644
--- a/src/scripting/vm/vmbuilder.cpp
+++ b/src/scripting/backend/vmbuilder.cpp
@@ -32,7 +32,7 @@
 */
 
 #include "vmbuilder.h"
-#include "codegeneration/codegen.h"
+#include "codegen.h"
 #include "info.h"
 #include "m_argv.h"
 #include "thingdef.h"
diff --git a/src/scripting/vm/vmbuilder.h b/src/scripting/backend/vmbuilder.h
similarity index 100%
rename from src/scripting/vm/vmbuilder.h
rename to src/scripting/backend/vmbuilder.h
diff --git a/src/scripting/vm/vmdisasm.cpp b/src/scripting/backend/vmdisasm.cpp
similarity index 100%
rename from src/scripting/vm/vmdisasm.cpp
rename to src/scripting/backend/vmdisasm.cpp
diff --git a/src/scripting/decorate/olddecorations.cpp b/src/scripting/decorate/olddecorations.cpp
index 5861138d6..575bbf0a4 100644
--- a/src/scripting/decorate/olddecorations.cpp
+++ b/src/scripting/decorate/olddecorations.cpp
@@ -47,7 +47,7 @@
 #include "decallib.h"
 #include "i_system.h"
 #include "thingdef.h"
-#include "codegeneration/codegen.h"
+#include "backend/codegen.h"
 #include "r_data/r_translate.h"
 
 // TYPES -------------------------------------------------------------------
diff --git a/src/scripting/decorate/thingdef_exp.cpp b/src/scripting/decorate/thingdef_exp.cpp
index 2b0866dd8..6757a2382 100644
--- a/src/scripting/decorate/thingdef_exp.cpp
+++ b/src/scripting/decorate/thingdef_exp.cpp
@@ -49,7 +49,7 @@
 #include "thingdef.h"
 #include "p_lnspec.h"
 #include "doomstat.h"
-#include "codegeneration/codegen.h"
+#include "backend/codegen.h"
 
 FRandom pr_exrandom ("EX_Random");
 
diff --git a/src/scripting/decorate/thingdef_parse.cpp b/src/scripting/decorate/thingdef_parse.cpp
index fc411186a..23ffc48e8 100644
--- a/src/scripting/decorate/thingdef_parse.cpp
+++ b/src/scripting/decorate/thingdef_parse.cpp
@@ -49,7 +49,7 @@
 #include "v_palette.h"
 #include "doomerrors.h"
 #include "i_system.h"
-#include "codegeneration/codegen.h"
+#include "backend/codegen.h"
 #include "w_wad.h"
 #include "v_video.h"
 #include "version.h"
diff --git a/src/scripting/decorate/thingdef_states.cpp b/src/scripting/decorate/thingdef_states.cpp
index 8e08fc038..63269eeeb 100644
--- a/src/scripting/decorate/thingdef_states.cpp
+++ b/src/scripting/decorate/thingdef_states.cpp
@@ -53,10 +53,10 @@
 #include "s_sound.h"
 #include "i_system.h"
 #include "colormatcher.h"
-#include "codegeneration/codegen.h"
+#include "backend/codegen.h"
 #include "version.h"
 #include "templates.h"
-#include "vmbuilder.h"
+#include "backend/vmbuilder.h"
 
 //==========================================================================
 //***
diff --git a/src/scripting/thingdef.cpp b/src/scripting/thingdef.cpp
index 6776e70e8..f2849eb39 100644
--- a/src/scripting/thingdef.cpp
+++ b/src/scripting/thingdef.cpp
@@ -60,9 +60,9 @@
 #include "p_conversation.h"
 #include "v_text.h"
 #include "thingdef.h"
-#include "codegeneration/codegen.h"
+#include "backend/codegen.h"
 #include "a_sharedglobal.h"
-#include "vmbuilder.h"
+#include "backend/vmbuilder.h"
 #include "stats.h"
 
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
diff --git a/src/scripting/thingdef_properties.cpp b/src/scripting/thingdef_properties.cpp
index 859ccb3f5..22d6610ce 100644
--- a/src/scripting/thingdef_properties.cpp
+++ b/src/scripting/thingdef_properties.cpp
@@ -66,7 +66,7 @@
 #include "teaminfo.h"
 #include "v_video.h"
 #include "r_data/colormaps.h"
-#include "vmbuilder.h"
+#include "backend/vmbuilder.h"
 #include "a_keys.h"
 #include "g_levellocals.h"
 
diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp
index 93f41746f..4972e1344 100644
--- a/src/scripting/zscript/zcc_compile.cpp
+++ b/src/scripting/zscript/zcc_compile.cpp
@@ -48,7 +48,7 @@
 #include "p_lnspec.h"
 #include "i_system.h"
 #include "gdtoa.h"
-#include "vmbuilder.h"
+#include "backend/vmbuilder.h"
 #include "version.h"
 
 static int GetIntConst(FxExpression *ex, FCompileContext &ctx)
diff --git a/src/scripting/zscript/zcc_compile.h b/src/scripting/zscript/zcc_compile.h
index a14443b7d..dc5fea565 100644
--- a/src/scripting/zscript/zcc_compile.h
+++ b/src/scripting/zscript/zcc_compile.h
@@ -2,7 +2,7 @@
 #define ZCC_COMPILE_H
 
 #include <memory>
-#include "codegeneration/codegen.h"
+#include "backend/codegen.h"
 
 struct Baggage;
 struct FPropertyInfo;