diff --git a/src/mame/skeleton/ms0515.cpp b/src/mame/cccp/ms0515.cpp
similarity index 100%
rename from src/mame/skeleton/ms0515.cpp
rename to src/mame/cccp/ms0515.cpp
diff --git a/src/mame/skeleton/chaos.cpp b/src/mame/homebrew/chaos.cpp
similarity index 100%
rename from src/mame/skeleton/chaos.cpp
rename to src/mame/homebrew/chaos.cpp
diff --git a/src/mame/skeleton/d6809.cpp b/src/mame/homebrew/d6809.cpp
similarity index 100%
rename from src/mame/skeleton/d6809.cpp
rename to src/mame/homebrew/d6809.cpp
diff --git a/src/mame/skeleton/gigatron.cpp b/src/mame/homebrew/gigatron.cpp
similarity index 100%
rename from src/mame/skeleton/gigatron.cpp
rename to src/mame/homebrew/gigatron.cpp
diff --git a/src/mame/skeleton/gs6502.cpp b/src/mame/homebrew/gs6502.cpp
similarity index 100%
rename from src/mame/skeleton/gs6502.cpp
rename to src/mame/homebrew/gs6502.cpp
diff --git a/src/mame/skeleton/gs6809.cpp b/src/mame/homebrew/gs6809.cpp
similarity index 100%
rename from src/mame/skeleton/gs6809.cpp
rename to src/mame/homebrew/gs6809.cpp
diff --git a/src/mame/skeleton/gscpm.cpp b/src/mame/homebrew/gscpm.cpp
similarity index 100%
rename from src/mame/skeleton/gscpm.cpp
rename to src/mame/homebrew/gscpm.cpp
diff --git a/src/mame/skeleton/gsz80.cpp b/src/mame/homebrew/gsz80.cpp
similarity index 100%
rename from src/mame/skeleton/gsz80.cpp
rename to src/mame/homebrew/gsz80.cpp
diff --git a/src/mame/skeleton/rc2014.cpp b/src/mame/homebrew/rc2014.cpp
similarity index 100%
rename from src/mame/skeleton/rc2014.cpp
rename to src/mame/homebrew/rc2014.cpp
diff --git a/src/mame/skeleton/ultim809.cpp b/src/mame/homebrew/ultim809.cpp
similarity index 100%
rename from src/mame/skeleton/ultim809.cpp
rename to src/mame/homebrew/ultim809.cpp
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index db2eb942dc9..2bfda4fc536 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -10410,7 +10410,7 @@ luxorves                        // Luxor Video Entertainment System (PAL)
 sabavdpl                        // SABA Videoplay - 1977 (PAL)
 sabavpl2                        // SABA Videoplay 2 (PAL)
 
-@source:skeleton/chaos.cpp
+@source:homebrew/chaos.cpp
 chaos                           //
 
 @source:univers/cheekyms.cpp
@@ -11807,7 +11807,7 @@ d461                            //
 @source:skeleton/d6800.cpp
 d6800                           // Dream 6800
 
-@source:skeleton/d6809.cpp
+@source:homebrew/d6809.cpp
 d6809                           //
 
 @source:excelent/d9final.cpp
@@ -15460,7 +15460,7 @@ touryuu                         // (c) 200? Yuki Enterprise
 giclasex
 giclassvr
 
-@source:skeleton/gigatron.cpp
+@source:homebrew/gigatron.cpp
 gigatron                        // (c) 2018 Marcel van Kervinck
 
 @source:konami/gijoe.cpp
@@ -31118,7 +31118,7 @@ blkbustr                        // (c) 1983 Kiwako + ECI license
 crazyblk                        // (c) 1983 Kiwako + ECI license
 mrjong                          // (c) 1983 Kiwako
 
-@source:skeleton/ms0515.cpp
+@source:cccp/ms0515.cpp
 ms0515                          //
 
 @source:cccp/ms6102.cpp
@@ -44660,22 +44660,22 @@ wavesynth
 simldv1000                      // Pioneer LD-V1000
 simpr8210                       // Pioneer PR-8210
 
-@source:skeleton/gsz80.cpp
+@source:homebrew/gsz80.cpp
 gsz80                           // Grant Searle's Simple Z-80 Machine
 
-@source:skeleton/gscpm.cpp
+@source:homebrew/gscpm.cpp
 gscpm                           // Grant Searle's Simple CP/M Machine
 
-@source:skeleton/gs6502.cpp
+@source:homebrew/gs6502.cpp
 gs6502                          // Grant Searle's Simple 6502 Machine
 
-@source:skeleton/gs6809.cpp
+@source:homebrew/gs6809.cpp
 gs6809                          // Grant Searle's Simple 6809 Machine
 
-@source:skeleton/ultim809.cpp
+@source:homebrew/ultim809.cpp
 ultim809
 
-@source:skeleton/rc2014.cpp
+@source:homebrew/rc2014.cpp
 rc2014                          // RC2014 Classic
 rc2014bp5                       // RC2014 Backplane-5
 rc2014bp8                       // RC2014 Backplane-8
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index 96d7926a03a..e440002f93f 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -129,6 +129,7 @@ cccp/mikrosha.cpp
 cccp/mk85.cpp
 cccp/mk90.cpp
 cccp/mk98.cpp
+cccp/ms0515.cpp
 cccp/ms6102.cpp
 cccp/okean240.cpp
 cccp/orion.cpp
@@ -324,7 +325,13 @@ hitachi/bmjr.cpp
 hitachi/bml3.cpp
 homebrew/4004clk.cpp
 homebrew/68ksbc.cpp
+homebrew/d6809.cpp
 homebrew/dcebridge.cpp
+homebrew/gigatron.cpp
+homebrew/gs6502.cpp
+homebrew/gs6809.cpp
+homebrew/gscpm.cpp
+homebrew/gsz80.cpp
 homebrew/homez80.cpp
 homebrew/lft_chiptune.cpp
 homebrew/lft_craft.cpp
@@ -334,9 +341,11 @@ homebrew/p112.cpp
 homebrew/phunsy.cpp
 homebrew/pimps.cpp
 homebrew/ravens.cpp
+homebrew/rc2014.cpp
 homebrew/sbc6510.cpp
 homebrew/sitcom.cpp
 homebrew/test_t400.cpp
+homebrew/ultim809.cpp
 homebrew/uzebox.cpp
 homebrew/z80clock.cpp
 homebrew/z80dev.cpp
@@ -802,7 +811,6 @@ skeleton/ct909e_segadvd.cpp
 skeleton/cxhumax.cpp
 skeleton/d400.cpp
 skeleton/d6800.cpp
-skeleton/d6809.cpp
 skeleton/daruma.cpp
 skeleton/datacast.cpp
 skeleton/design.cpp
@@ -840,16 +848,11 @@ skeleton/fs3216.cpp
 skeleton/ft68m.cpp
 skeleton/gameking.cpp
 skeleton/gem_rp.cpp
-skeleton/gigatron.cpp
 skeleton/gimix.cpp
 skeleton/gm1000.cpp
 skeleton/gnat10.cpp
 skeleton/goupil.cpp
 skeleton/grfd2301.cpp
-skeleton/gs6502.cpp
-skeleton/gs6809.cpp
-skeleton/gscpm.cpp
-skeleton/gsz80.cpp
 skeleton/hazeltin.cpp
 skeleton/hazl1420.cpp
 skeleton/hohnadam.cpp
@@ -906,7 +909,6 @@ skeleton/mod8.cpp
 skeleton/modellot.cpp
 skeleton/molecular.cpp
 skeleton/monon_color.cpp
-skeleton/ms0515.cpp
 skeleton/ms9540.cpp
 skeleton/mstation.cpp
 skeleton/mt735.cpp
@@ -940,7 +942,6 @@ skeleton/pulsar.cpp
 skeleton/pv9234.cpp
 skeleton/pwp14.cpp
 skeleton/qtsbc.cpp
-skeleton/rc2014.cpp
 skeleton/rd100.cpp
 skeleton/rvoice.cpp
 skeleton/sacstate.cpp
@@ -983,7 +984,6 @@ skeleton/tr175.cpp
 skeleton/trs80dt1.cpp
 skeleton/tsispch.cpp
 skeleton/tulip1.cpp
-skeleton/ultim809.cpp
 skeleton/unistar.cpp
 skeleton/v6809.cpp
 skeleton/vanguardmk1.cpp