diff --git a/radiant/Makefile.am b/radiant/Makefile.am
index 9f72017478..4aa6bbee7d 100644
--- a/radiant/Makefile.am
+++ b/radiant/Makefile.am
@@ -70,10 +70,6 @@ darkradiant_SOURCES = main.cpp \
eventmanager/Statement.cpp \
eventmanager/Toggle.cpp \
eventmanager/WidgetToggle.cpp \
- fonts/FontLoader.cpp \
- fonts/GlyphInfo.cpp \
- fonts/GlyphSet.cpp \
- fonts/FontManager.cpp \
map/MapModules.cpp \
map/format/Quake3MapFormat.cpp \
map/format/Quake4MapFormat.cpp \
diff --git a/radiantcore/Makefile.am b/radiantcore/Makefile.am
index 3833b92797..568210ad93 100644
--- a/radiantcore/Makefile.am
+++ b/radiantcore/Makefile.am
@@ -71,6 +71,10 @@ libradiantcore_la_SOURCES = Radiant.cpp \
filters/BasicFilterSystem.cpp \
filters/XMLFilter.cpp \
filters/XmlFilterEventAdapter.cpp \
+ fonts/FontLoader.cpp \
+ fonts/GlyphInfo.cpp \
+ fonts/GlyphSet.cpp \
+ fonts/FontManager.cpp \
grid/GridManager.cpp \
imagefile/dds.cpp \
imagefile/ddslib.cpp \
diff --git a/radiant/fonts/FontInfo.h b/radiantcore/fonts/FontInfo.h
similarity index 100%
rename from radiant/fonts/FontInfo.h
rename to radiantcore/fonts/FontInfo.h
diff --git a/radiant/fonts/FontLoader.cpp b/radiantcore/fonts/FontLoader.cpp
similarity index 100%
rename from radiant/fonts/FontLoader.cpp
rename to radiantcore/fonts/FontLoader.cpp
diff --git a/radiant/fonts/FontLoader.h b/radiantcore/fonts/FontLoader.h
similarity index 100%
rename from radiant/fonts/FontLoader.h
rename to radiantcore/fonts/FontLoader.h
diff --git a/radiant/fonts/FontManager.cpp b/radiantcore/fonts/FontManager.cpp
similarity index 100%
rename from radiant/fonts/FontManager.cpp
rename to radiantcore/fonts/FontManager.cpp
diff --git a/radiant/fonts/FontManager.h b/radiantcore/fonts/FontManager.h
similarity index 100%
rename from radiant/fonts/FontManager.h
rename to radiantcore/fonts/FontManager.h
diff --git a/radiant/fonts/GlyphInfo.cpp b/radiantcore/fonts/GlyphInfo.cpp
similarity index 100%
rename from radiant/fonts/GlyphInfo.cpp
rename to radiantcore/fonts/GlyphInfo.cpp
diff --git a/radiant/fonts/GlyphInfo.h b/radiantcore/fonts/GlyphInfo.h
similarity index 100%
rename from radiant/fonts/GlyphInfo.h
rename to radiantcore/fonts/GlyphInfo.h
diff --git a/radiant/fonts/GlyphSet.cpp b/radiantcore/fonts/GlyphSet.cpp
similarity index 100%
rename from radiant/fonts/GlyphSet.cpp
rename to radiantcore/fonts/GlyphSet.cpp
diff --git a/radiant/fonts/GlyphSet.h b/radiantcore/fonts/GlyphSet.h
similarity index 100%
rename from radiant/fonts/GlyphSet.h
rename to radiantcore/fonts/GlyphSet.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
index 7026dd0c5b..bbaf0c02d0 100644
--- a/tools/msvc/DarkRadiant.vcxproj
+++ b/tools/msvc/DarkRadiant.vcxproj
@@ -204,10 +204,6 @@
-
-
-
-
@@ -927,11 +923,6 @@
-
-
-
-
-
diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
index bd843acb72..b6894de73a 100644
--- a/tools/msvc/DarkRadiant.vcxproj.filters
+++ b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -209,9 +209,6 @@
{9ece5d35-1ea4-4651-aa2c-b8a9c80b62da}
-
- {a921dcd3-1518-490e-baf1-4b75bdd130c7}
-
{a33db67b-1632-47ad-9368-04d014d7d730}
@@ -1042,18 +1039,6 @@
src\md5model
-
- src\fonts
-
-
- src\fonts
-
-
- src\fonts
-
-
- src\fonts
-
src\ui
@@ -2142,21 +2127,6 @@
src\md5model
-
- src\fonts
-
-
- src\fonts
-
-
- src\fonts
-
-
- src\fonts
-
-
- src\fonts
-
src\ui
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
index 4f0d5da998..f1eaebc446 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj
+++ b/tools/msvc/DarkRadiantCore.vcxproj
@@ -57,6 +57,10 @@
+
+
+
+
@@ -194,6 +198,11 @@
+
+
+
+
+
diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
index 99b032f2b2..4c1be418e8 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj.filters
+++ b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -110,6 +110,9 @@
{eda86d46-9b16-4fa4-b6cb-f302f83d0f07}
+
+ {b941367d-6eda-43b5-8d6d-ed46974b796c}
+
@@ -451,6 +454,18 @@
src\particles
+
+ src\fonts
+
+
+ src\fonts
+
+
+ src\fonts
+
+
+ src\fonts
+
@@ -966,5 +981,20 @@
src\particles
+
+ src\fonts
+
+
+ src\fonts
+
+
+ src\fonts
+
+
+ src\fonts
+
+
+ src\fonts
+
\ No newline at end of file