diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 78d2692d5b9..be2a973a831 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -468,27 +468,6 @@ mpc60
 @source:akai/mpc3000.cpp
 mpc3000
 
-@source:alba/albazg.cpp
-hana6pt2
-yumefuda
-
-@source:alba/hanadojo.cpp
-hanadojo
-hanadojoa
-
-@source:alba/rmhaihai.cpp
-rmhaihai
-rmhaihai2
-rmhaihaibl
-rmhaihib
-rmhaijin
-rmhaisei
-themj
-themj2
-
-@source:alba/vsmjtria.cpp
-vsmjtria
-
 @source:alesis/alesis.cpp
 hr16
 hr16b
@@ -41769,6 +41748,10 @@ prpht600
 @source:seta/albazc.cpp
 hanaroku
 
+@source:seta/albazg.cpp
+hana6pt2
+yumefuda
+
 @source:seta/champbwl.cpp
 champbwl
 champbwla
@@ -41790,6 +41773,10 @@ usclssic
 @source:seta/hanaawas.cpp
 hanaawas
 
+@source:seta/hanadojo.cpp
+hanadojo
+hanadojoa
+
 @source:seta/jclub2.cpp
 darkhors
 jclub2bl
@@ -41819,6 +41806,16 @@ yuka
 @source:seta/namcoeva.cpp
 hammerch
 
+@source:seta/rmhaihai.cpp
+rmhaihai
+rmhaihai2
+rmhaihaibl
+rmhaihib
+rmhaijin
+rmhaisei
+themj
+themj2
+
 @source:seta/seta.cpp
 atehate
 blandia
@@ -41998,6 +41995,9 @@ vasara2a
 @source:seta/thedealr.cpp
 thedealr
 
+@source:seta/vsmjtria.cpp
+vsmjtria
+
 @source:sfrj/galaxy.cpp
 galaxy
 galaxyp
diff --git a/src/mame/alba/albazg.cpp b/src/mame/seta/albazg.cpp
similarity index 100%
rename from src/mame/alba/albazg.cpp
rename to src/mame/seta/albazg.cpp
diff --git a/src/mame/alba/hanadojo.cpp b/src/mame/seta/hanadojo.cpp
similarity index 100%
rename from src/mame/alba/hanadojo.cpp
rename to src/mame/seta/hanadojo.cpp
diff --git a/src/mame/alba/rmhaihai.cpp b/src/mame/seta/rmhaihai.cpp
similarity index 100%
rename from src/mame/alba/rmhaihai.cpp
rename to src/mame/seta/rmhaihai.cpp
diff --git a/src/mame/alba/vsmjtria.cpp b/src/mame/seta/vsmjtria.cpp
similarity index 99%
rename from src/mame/alba/vsmjtria.cpp
rename to src/mame/seta/vsmjtria.cpp
index d409745d858..5fdc1be0189 100644
--- a/src/mame/alba/vsmjtria.cpp
+++ b/src/mame/seta/vsmjtria.cpp
@@ -14,7 +14,7 @@ I/O:    2x 8255, 4x 8-dip banks, 1x single dip switch (at position 11m)
 OSC:    20MHz
 
 Notes:
-- Loosely based off alba/rmhaihai.cpp.
+- Loosely based off seta/rmhaihai.cpp.
   Changes needed for merging both implementations seems too non-trivial to warrant a
   driver merge, basically just the video HW, the CRTC (448x224 clocked at 20 MHz?)
   and a few I/O bits looks similar, the odd screen size is also a thing in srmp2.cpp