diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3c59a8c376..cd4d922df1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -890,9 +890,6 @@ set (PCH_SOURCES
 	c_dispatch.cpp
 	c_expr.cpp
 	c_functions.cpp
-	cmdlib.cpp
-	colormatcher.cpp
-	configfile.cpp
 	ct_chat.cpp
 	cycler.cpp
 	d_dehacked.cpp
@@ -920,18 +917,12 @@ set (PCH_SOURCES
 	gi.cpp
 	gitinfo.cpp
 	hu_scores.cpp
-	i_module.cpp
 	i_net.cpp
-	i_time.cpp
 	info.cpp
 	keysections.cpp
-	m_alloc.cpp
-	m_argv.cpp
-	m_bbox.cpp
 	m_cheat.cpp
 	m_joy.cpp
 	m_misc.cpp
-	name.cpp
 	p_acs.cpp
 	p_actionfunctions.cpp
 	p_conversation.cpp
@@ -961,7 +952,6 @@ set (PCH_SOURCES
 	r_videoscale.cpp
 	s_advsound.cpp
 	s_environment.cpp
-	s_playlist.cpp
 	s_sndseq.cpp
 	s_sound.cpp
 	serializer.cpp
@@ -974,7 +964,6 @@ set (PCH_SOURCES
 	umapinfo.cpp
 	v_2ddrawer.cpp
 	v_blend.cpp
-	v_collection.cpp
 	v_draw.cpp
 	v_font.cpp
 	v_framebuffer.cpp
@@ -984,7 +973,6 @@ set (PCH_SOURCES
 	v_video.cpp
 	w_wad.cpp
 	wi_stuff.cpp
-	zstrformat.cpp
 	g_inventory/a_keys.cpp
 	g_inventory/a_pickups.cpp
 	g_inventory/a_weapons.cpp
@@ -1262,6 +1250,18 @@ set (PCH_SOURCES
 	utility/nodebuilder/nodebuild_gl.cpp
 	utility/nodebuilder/nodebuild_utility.cpp
 	utility/sc_man.cpp
+	utility/cmdlib.cpp
+	utility/colormatcher.cpp
+	utility/configfile.cpp
+	utility/i_module.cpp
+	utility/i_time.cpp
+	utility/m_alloc.cpp
+	utility/m_argv.cpp
+	utility/m_bbox.cpp
+	utility/name.cpp
+	utility/s_playlist.cpp
+	utility/v_collection.cpp
+	utility/zstrformat.cpp
 )
 
 enable_precompiled_headers( g_pch.h PCH_SOURCES )
@@ -1274,9 +1274,9 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE
 	${X86_SOURCES}
 	${FASTMATH_SOURCES}
 	${PCH_SOURCES}
-	x86.cpp
+	utility/x86.cpp
 	utility/strnatcmp.c
-	zstring.cpp
+	utility/zstring.cpp
 	utility/math/asin.c
 	utility/math/atan.c
 	utility/math/const.c
diff --git a/src/cmdlib.cpp b/src/utility/cmdlib.cpp
similarity index 100%
rename from src/cmdlib.cpp
rename to src/utility/cmdlib.cpp
diff --git a/src/cmdlib.h b/src/utility/cmdlib.h
similarity index 100%
rename from src/cmdlib.h
rename to src/utility/cmdlib.h
diff --git a/src/colormatcher.cpp b/src/utility/colormatcher.cpp
similarity index 100%
rename from src/colormatcher.cpp
rename to src/utility/colormatcher.cpp
diff --git a/src/colormatcher.h b/src/utility/colormatcher.h
similarity index 100%
rename from src/colormatcher.h
rename to src/utility/colormatcher.h
diff --git a/src/configfile.cpp b/src/utility/configfile.cpp
similarity index 100%
rename from src/configfile.cpp
rename to src/utility/configfile.cpp
diff --git a/src/configfile.h b/src/utility/configfile.h
similarity index 100%
rename from src/configfile.h
rename to src/utility/configfile.h
diff --git a/src/i_module.cpp b/src/utility/i_module.cpp
similarity index 100%
rename from src/i_module.cpp
rename to src/utility/i_module.cpp
diff --git a/src/i_module.h b/src/utility/i_module.h
similarity index 100%
rename from src/i_module.h
rename to src/utility/i_module.h
diff --git a/src/i_time.cpp b/src/utility/i_time.cpp
similarity index 100%
rename from src/i_time.cpp
rename to src/utility/i_time.cpp
diff --git a/src/i_time.h b/src/utility/i_time.h
similarity index 100%
rename from src/i_time.h
rename to src/utility/i_time.h
diff --git a/src/lists.h b/src/utility/lists.h
similarity index 100%
rename from src/lists.h
rename to src/utility/lists.h
diff --git a/src/m_alloc.cpp b/src/utility/m_alloc.cpp
similarity index 100%
rename from src/m_alloc.cpp
rename to src/utility/m_alloc.cpp
diff --git a/src/m_alloc.h b/src/utility/m_alloc.h
similarity index 100%
rename from src/m_alloc.h
rename to src/utility/m_alloc.h
diff --git a/src/m_argv.cpp b/src/utility/m_argv.cpp
similarity index 100%
rename from src/m_argv.cpp
rename to src/utility/m_argv.cpp
diff --git a/src/m_argv.h b/src/utility/m_argv.h
similarity index 100%
rename from src/m_argv.h
rename to src/utility/m_argv.h
diff --git a/src/m_bbox.cpp b/src/utility/m_bbox.cpp
similarity index 100%
rename from src/m_bbox.cpp
rename to src/utility/m_bbox.cpp
diff --git a/src/m_bbox.h b/src/utility/m_bbox.h
similarity index 100%
rename from src/m_bbox.h
rename to src/utility/m_bbox.h
diff --git a/src/m_crc32.h b/src/utility/m_crc32.h
similarity index 100%
rename from src/m_crc32.h
rename to src/utility/m_crc32.h
diff --git a/src/m_fixed.h b/src/utility/m_fixed.h
similarity index 100%
rename from src/m_fixed.h
rename to src/utility/m_fixed.h
diff --git a/src/name.cpp b/src/utility/name.cpp
similarity index 100%
rename from src/name.cpp
rename to src/utility/name.cpp
diff --git a/src/name.h b/src/utility/name.h
similarity index 100%
rename from src/name.h
rename to src/utility/name.h
diff --git a/src/namedef.h b/src/utility/namedef.h
similarity index 100%
rename from src/namedef.h
rename to src/utility/namedef.h
diff --git a/src/s_playlist.cpp b/src/utility/s_playlist.cpp
similarity index 100%
rename from src/s_playlist.cpp
rename to src/utility/s_playlist.cpp
diff --git a/src/s_playlist.h b/src/utility/s_playlist.h
similarity index 100%
rename from src/s_playlist.h
rename to src/utility/s_playlist.h
diff --git a/src/tarray.h b/src/utility/tarray.h
similarity index 100%
rename from src/tarray.h
rename to src/utility/tarray.h
diff --git a/src/v_collection.cpp b/src/utility/v_collection.cpp
similarity index 100%
rename from src/v_collection.cpp
rename to src/utility/v_collection.cpp
diff --git a/src/v_collection.h b/src/utility/v_collection.h
similarity index 100%
rename from src/v_collection.h
rename to src/utility/v_collection.h
diff --git a/src/vectors.h b/src/utility/vectors.h
similarity index 100%
rename from src/vectors.h
rename to src/utility/vectors.h
diff --git a/src/weightedlist.h b/src/utility/weightedlist.h
similarity index 100%
rename from src/weightedlist.h
rename to src/utility/weightedlist.h
diff --git a/src/x86.cpp b/src/utility/x86.cpp
similarity index 100%
rename from src/x86.cpp
rename to src/utility/x86.cpp
diff --git a/src/x86.h b/src/utility/x86.h
similarity index 100%
rename from src/x86.h
rename to src/utility/x86.h
diff --git a/src/zstrformat.cpp b/src/utility/zstrformat.cpp
similarity index 100%
rename from src/zstrformat.cpp
rename to src/utility/zstrformat.cpp
diff --git a/src/zstring.cpp b/src/utility/zstring.cpp
similarity index 100%
rename from src/zstring.cpp
rename to src/utility/zstring.cpp
diff --git a/src/zstring.h b/src/utility/zstring.h
similarity index 100%
rename from src/zstring.h
rename to src/utility/zstring.h