diff --git a/src/servers/app/fonts/psfonts/bchb.afm b/data/etc/fonts/psfonts/bchb.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/bchb.afm
rename to data/etc/fonts/psfonts/bchb.afm
diff --git a/src/servers/app/fonts/psfonts/bchb.pfb b/data/etc/fonts/psfonts/bchb.pfb
similarity index 100%
rename from src/servers/app/fonts/psfonts/bchb.pfb
rename to data/etc/fonts/psfonts/bchb.pfb
diff --git a/src/servers/app/fonts/psfonts/bchbi.afm b/data/etc/fonts/psfonts/bchbi.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/bchbi.afm
rename to data/etc/fonts/psfonts/bchbi.afm
diff --git a/src/servers/app/fonts/psfonts/bchbi.pfb b/data/etc/fonts/psfonts/bchbi.pfb
similarity index 100%
rename from src/servers/app/fonts/psfonts/bchbi.pfb
rename to data/etc/fonts/psfonts/bchbi.pfb
diff --git a/src/servers/app/fonts/psfonts/bchr.afm b/data/etc/fonts/psfonts/bchr.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/bchr.afm
rename to data/etc/fonts/psfonts/bchr.afm
diff --git a/src/servers/app/fonts/psfonts/bchr.pfb b/data/etc/fonts/psfonts/bchr.pfb
similarity index 100%
rename from src/servers/app/fonts/psfonts/bchr.pfb
rename to data/etc/fonts/psfonts/bchr.pfb
diff --git a/src/servers/app/fonts/psfonts/bchri.afm b/data/etc/fonts/psfonts/bchri.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/bchri.afm
rename to data/etc/fonts/psfonts/bchri.afm
diff --git a/src/servers/app/fonts/psfonts/bchri.pfb b/data/etc/fonts/psfonts/bchri.pfb
similarity index 100%
rename from src/servers/app/fonts/psfonts/bchri.pfb
rename to data/etc/fonts/psfonts/bchri.pfb
diff --git a/src/servers/app/fonts/psfonts/cour.afm b/data/etc/fonts/psfonts/cour.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/cour.afm
rename to data/etc/fonts/psfonts/cour.afm
diff --git a/src/servers/app/fonts/psfonts/cour.pfa b/data/etc/fonts/psfonts/cour.pfa
similarity index 100%
rename from src/servers/app/fonts/psfonts/cour.pfa
rename to data/etc/fonts/psfonts/cour.pfa
diff --git a/src/servers/app/fonts/psfonts/courb.afm b/data/etc/fonts/psfonts/courb.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/courb.afm
rename to data/etc/fonts/psfonts/courb.afm
diff --git a/src/servers/app/fonts/psfonts/courb.pfa b/data/etc/fonts/psfonts/courb.pfa
similarity index 100%
rename from src/servers/app/fonts/psfonts/courb.pfa
rename to data/etc/fonts/psfonts/courb.pfa
diff --git a/src/servers/app/fonts/psfonts/courbi.afm b/data/etc/fonts/psfonts/courbi.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/courbi.afm
rename to data/etc/fonts/psfonts/courbi.afm
diff --git a/src/servers/app/fonts/psfonts/courbi.pfa b/data/etc/fonts/psfonts/courbi.pfa
similarity index 100%
rename from src/servers/app/fonts/psfonts/courbi.pfa
rename to data/etc/fonts/psfonts/courbi.pfa
diff --git a/src/servers/app/fonts/psfonts/couri.afm b/data/etc/fonts/psfonts/couri.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/couri.afm
rename to data/etc/fonts/psfonts/couri.afm
diff --git a/src/servers/app/fonts/psfonts/couri.pfa b/data/etc/fonts/psfonts/couri.pfa
similarity index 100%
rename from src/servers/app/fonts/psfonts/couri.pfa
rename to data/etc/fonts/psfonts/couri.pfa
diff --git a/src/servers/app/fonts/psfonts/cr-pc8.afm b/data/etc/fonts/psfonts/cr-pc8.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/cr-pc8.afm
rename to data/etc/fonts/psfonts/cr-pc8.afm
diff --git a/src/servers/app/fonts/psfonts/crb-pc8.afm b/data/etc/fonts/psfonts/crb-pc8.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/crb-pc8.afm
rename to data/etc/fonts/psfonts/crb-pc8.afm
diff --git a/src/servers/app/fonts/psfonts/crbi-pc8.afm b/data/etc/fonts/psfonts/crbi-pc8.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/crbi-pc8.afm
rename to data/etc/fonts/psfonts/crbi-pc8.afm
diff --git a/src/servers/app/fonts/psfonts/cri-pc8.afm b/data/etc/fonts/psfonts/cri-pc8.afm
similarity index 100%
rename from src/servers/app/fonts/psfonts/cri-pc8.afm
rename to data/etc/fonts/psfonts/cri-pc8.afm
diff --git a/src/servers/app/fonts/ttfonts/Vera.ttf b/data/etc/fonts/ttfonts/Vera.ttf
similarity index 100%
rename from src/servers/app/fonts/ttfonts/Vera.ttf
rename to data/etc/fonts/ttfonts/Vera.ttf
diff --git a/src/servers/app/fonts/ttfonts/VeraBI.ttf b/data/etc/fonts/ttfonts/VeraBI.ttf
similarity index 100%
rename from src/servers/app/fonts/ttfonts/VeraBI.ttf
rename to data/etc/fonts/ttfonts/VeraBI.ttf
diff --git a/src/servers/app/fonts/ttfonts/VeraBd.ttf b/data/etc/fonts/ttfonts/VeraBd.ttf
similarity index 100%
rename from src/servers/app/fonts/ttfonts/VeraBd.ttf
rename to data/etc/fonts/ttfonts/VeraBd.ttf
diff --git a/src/servers/app/fonts/ttfonts/VeraIt.ttf b/data/etc/fonts/ttfonts/VeraIt.ttf
similarity index 100%
rename from src/servers/app/fonts/ttfonts/VeraIt.ttf
rename to data/etc/fonts/ttfonts/VeraIt.ttf
diff --git a/src/servers/app/fonts/ttfonts/VeraMoBI.ttf b/data/etc/fonts/ttfonts/VeraMoBI.ttf
similarity index 100%
rename from src/servers/app/fonts/ttfonts/VeraMoBI.ttf
rename to data/etc/fonts/ttfonts/VeraMoBI.ttf
diff --git a/src/servers/app/fonts/ttfonts/VeraMoBd.ttf b/data/etc/fonts/ttfonts/VeraMoBd.ttf
similarity index 100%
rename from src/servers/app/fonts/ttfonts/VeraMoBd.ttf
rename to data/etc/fonts/ttfonts/VeraMoBd.ttf
diff --git a/src/servers/app/fonts/ttfonts/VeraMoIt.ttf b/data/etc/fonts/ttfonts/VeraMoIt.ttf
similarity index 100%
rename from src/servers/app/fonts/ttfonts/VeraMoIt.ttf
rename to data/etc/fonts/ttfonts/VeraMoIt.ttf
diff --git a/src/servers/app/fonts/ttfonts/VeraMono.ttf b/data/etc/fonts/ttfonts/VeraMono.ttf
similarity index 100%
rename from src/servers/app/fonts/ttfonts/VeraMono.ttf
rename to data/etc/fonts/ttfonts/VeraMono.ttf
diff --git a/src/servers/app/fonts/ttfonts/VeraSe.ttf b/data/etc/fonts/ttfonts/VeraSe.ttf
similarity index 100%
rename from src/servers/app/fonts/ttfonts/VeraSe.ttf
rename to data/etc/fonts/ttfonts/VeraSe.ttf
diff --git a/src/servers/app/fonts/ttfonts/VeraSeBd.ttf b/data/etc/fonts/ttfonts/VeraSeBd.ttf
similarity index 100%
rename from src/servers/app/fonts/ttfonts/VeraSeBd.ttf
rename to data/etc/fonts/ttfonts/VeraSeBd.ttf
diff --git a/src/servers/app/fonts/Jamfile b/src/servers/app/fonts/Jamfile
deleted file mode 100644
index bf398df313..0000000000
--- a/src/servers/app/fonts/Jamfile
+++ /dev/null
@@ -1,4 +0,0 @@
-SubDir OBOS_TOP src servers app fonts ;
-
-SubInclude OBOS_TOP src servers app fonts psfonts ;
-SubInclude OBOS_TOP src servers app fonts ttfonts ;
diff --git a/src/servers/app/fonts/psfonts/Jamfile b/src/servers/app/fonts/psfonts/Jamfile
deleted file mode 100644
index 3e6947637e..0000000000
--- a/src/servers/app/fonts/psfonts/Jamfile
+++ /dev/null
@@ -1,24 +0,0 @@
-SubDir OBOS_TOP src servers app fonts psfonts ;
-
-OBOSInstall install_fonts : [ FDirName $(OBOS_FONTS_DIR) psfonts ] :
-	bchbi.afm
-	bchr.pfb
-	cour.afm
-	courb.pfa
-	couri.afm
-	crb-pc8.afm
-	bchb.afm
-	bchbi.pfb
-	bchri.afm
-	cour.pfa
-	courbi.afm
-	couri.pfa
-	crbi-pc8.afm
-	bchb.pfb
-	bchr.afm
-	bchri.pfb
-	courb.afm
-	courbi.pfa
-	cr-pc8.afm
-	cri-pc8.afm
-;
\ No newline at end of file
diff --git a/src/servers/app/fonts/ttfonts/Jamfile b/src/servers/app/fonts/ttfonts/Jamfile
deleted file mode 100644
index f7b1e90e23..0000000000
--- a/src/servers/app/fonts/ttfonts/Jamfile
+++ /dev/null
@@ -1,14 +0,0 @@
-SubDir OBOS_TOP src servers app fonts ttfonts ;
-
-OBOSInstall install_fonts : [ FDirName $(OBOS_FONTS_DIR) ttfonts ] :
-	Vera.ttf
-	VeraBd.ttf
-	VeraMoBI.ttf
-	VeraMoIt.ttf
-	VeraSe.ttf
-	VeraBI.ttf
-	VeraIt.ttf
-	VeraMoBd.ttf
-	VeraMono.ttf
-	VeraSeBd.ttf
-;
\ No newline at end of file