diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 5c40ab1074a..4c4eb4407fc 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -31335,9 +31335,6 @@ mirderby                        // (c) 1988 Home Data?
 @source:misc/mjsenpu.cpp
 mjsenpu
 
-@source:misc/mole.cpp
-mole                            // (c) 1982 Yachiyo Electronics, Ltd.
-
 @source:misc/monon_color.cpp
 mononcol                        // (c) 2011 M&D
 
@@ -32418,14 +32415,6 @@ vcarn                           // (c) 1999 Electronic Projects
 sprcros2                        // (c) 1986 GM Shoji
 sprcros2a                       // (c) 1986 GM Shoji
 
-@source:misc/ssingles.cpp
-atamanot                        // (c) 1983 Yachiyo Denki / Uni Enterprize
-ssingles                        // Yachiyo?
-
-@source:misc/sstrangr.cpp
-sstrangr                        // (c) 1978 Yachiyo Electronics, Ltd.
-sstrangr2                       // (c) 1979 Yachiyo Electronics, Ltd.
-
 @source:misc/startouch.cpp
 europl01                        //
 
@@ -47321,6 +47310,17 @@ x168                            //
 x820                            //
 x820ii                          //
 
+@source:yachiyo/mole.cpp
+mole                            // (c) 1982 Yachiyo Electronics, Ltd.
+
+@source:yachiyo/ssingles.cpp
+atamanot                        // (c) 1983 Yachiyo Denki / Uni Enterprize
+ssingles                        // Yachiyo?
+
+@source:yachiyo/sstrangr.cpp
+sstrangr                        // (c) 1978 Yachiyo Electronics, Ltd.
+sstrangr2                       // (c) 1979 Yachiyo Electronics, Ltd.
+
 @source:yamaha/fb01.cpp
 fb01                            // 1986 FB-01
 
diff --git a/src/mame/misc/mole.cpp b/src/mame/yachiyo/mole.cpp
similarity index 100%
rename from src/mame/misc/mole.cpp
rename to src/mame/yachiyo/mole.cpp
diff --git a/src/mame/misc/ssingles.cpp b/src/mame/yachiyo/ssingles.cpp
similarity index 100%
rename from src/mame/misc/ssingles.cpp
rename to src/mame/yachiyo/ssingles.cpp
diff --git a/src/mame/misc/sstrangr.cpp b/src/mame/yachiyo/sstrangr.cpp
similarity index 100%
rename from src/mame/misc/sstrangr.cpp
rename to src/mame/yachiyo/sstrangr.cpp