diff --git a/README.md b/README.md
index bb21b71..b4334b0 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ It can also run games for other consoles. This pack already contains the followi
 - nestopia (Famicom/Nintendo Entertainment System, Famicom Disk System)
 
 The following cores are available as additional modules (in core_modules / cores folder):
-- snes9x2010 (Super Famicom/Super Nintendo)
+- snes9x2005 (Super Famicom/Super Nintendo)
 - gambatte_libretro (Game Boy, Game Boy Color)
 - mgba (Game Boy Advance)
 - glupen64 (Nintendo 64)
@@ -19,10 +19,10 @@ The following cores are available as additional modules (in core_modules / cores
 - fb_alpha and fb_alpha_cps2 (various arcade machines)
 - picodrive (Sega Master System, Genesis/Mega Drive, Game Gear, Sega 32X)
 
-Extra RetroArch modules and modules created by other users (in core_modules_extra / extra_cores folder):
+Extra RetroArch modules and modules created by other users (in core_modules_extra folder):
 - mupen64plus (Nintendo 64)
 - snes9x2002 (Super Famicom/Super Nintendo)
-- snes9x2005 (Super Famicom/Super Nintendo)
+- snes9x2010 (Super Famicom/Super Nintendo) (savestates disabled due to some bug in the core)
 - caprice32 (Amstrad CPC), compiled and fixed by D_Skywalk, provided by 1lokolo1/nesito
 - fbalpha2012_neogeo (Neo-Geo), provided by 1lokolo1/nesito
 - fuse (ZX Spectrum), compiled and fixed by D_Skywalk, provided by 1lokolo1/nesito
@@ -95,13 +95,13 @@ Executables and arguments for all available cores:
         - /bin/32x <rom> <clover_args>
           runs "picodrive" core
         - /bin/snes <rom> <clover_args>
-          runs "snes9x2010" core or "snes9x2005" or "snes9x2002" core
+          runs "snes9x2005" or "snes9x2010" core or "snes9x2002" core
         - /bin/snes02 <rom> <clover_args>
-          runs "snes9x2002" core
+          runs "snes9x2002" core if snes9x2005 or snes9x2010 is installed as a main core
         - /bin/snes05 <rom> <clover_args>
-          runs "snes9x2005" core
+          runs "snes9x2005" core if snes9x2002 or snes9x2010 is installed as a main core
         - /bin/snes10 <rom> <clover_args>
-          runs "snes9x2010" core if snes9x2005 or snes9x2002 is installed as a main core
+          runs "snes9x2010" core if snes9x2002 or snes9x2005 is installed as a main core
         - /bin/n64 <rom> <clover_args>
           runs "glupen64" core or "mupen64plus" core
         - /bin/n64p <rom> <clover_args>
diff --git a/core_modules_extra/use_snes9x2005.hmod/bin/snes b/core_modules/snes9x2005.hmod/bin/snes
similarity index 100%
rename from core_modules_extra/use_snes9x2005.hmod/bin/snes
rename to core_modules/snes9x2005.hmod/bin/snes
diff --git a/core_modules_extra/snes9x2005.hmod/etc/libretro/core/snes9x2005_libretro.so b/core_modules/snes9x2005.hmod/etc/libretro/core/snes9x2005_libretro.so
similarity index 100%
rename from core_modules_extra/snes9x2005.hmod/etc/libretro/core/snes9x2005_libretro.so
rename to core_modules/snes9x2005.hmod/etc/libretro/core/snes9x2005_libretro.so
diff --git a/core_modules_extra/snes9x2005.hmod/etc/libretro/info/snes9x2005_libretro.info b/core_modules/snes9x2005.hmod/etc/libretro/info/snes9x2005_libretro.info
similarity index 100%
rename from core_modules_extra/snes9x2005.hmod/etc/libretro/info/snes9x2005_libretro.info
rename to core_modules/snes9x2005.hmod/etc/libretro/info/snes9x2005_libretro.info
diff --git a/core_modules/snes9x2010.hmod/install b/core_modules/snes9x2005.hmod/install
similarity index 100%
rename from core_modules/snes9x2010.hmod/install
rename to core_modules/snes9x2005.hmod/install
diff --git a/core_modules_extra/snes9x2005.hmod/readme.txt b/core_modules/snes9x2005.hmod/readme.txt
similarity index 86%
rename from core_modules_extra/snes9x2005.hmod/readme.txt
rename to core_modules/snes9x2005.hmod/readme.txt
index 03f31f1..061c89c 100644
--- a/core_modules_extra/snes9x2005.hmod/readme.txt
+++ b/core_modules/snes9x2005.hmod/readme.txt
@@ -3,7 +3,7 @@
 This module will add support for Super Famicom / Super Nintendo games to RetroArch
 
 Available executables and arguments:
-- /bin/snes05 <rom> <clover_args>
+- /bin/snes <rom> <clover_args>
   runs "snes9x2005" core
 
 Core by libretro
diff --git a/core_modules_extra/snes9x2010.hmod/bin/snes10 b/core_modules_extra/snes9x2010.hmod/bin/snes10
new file mode 100755
index 0000000..89e4558
--- /dev/null
+++ b/core_modules_extra/snes9x2010.hmod/bin/snes10
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover snes9x2010 "$@" --ra-nosaves
diff --git a/core_modules/snes9x2010.hmod/etc/libretro/core/snes9x2010_libretro.so b/core_modules_extra/snes9x2010.hmod/etc/libretro/core/snes9x2010_libretro.so
similarity index 100%
rename from core_modules/snes9x2010.hmod/etc/libretro/core/snes9x2010_libretro.so
rename to core_modules_extra/snes9x2010.hmod/etc/libretro/core/snes9x2010_libretro.so
diff --git a/core_modules/snes9x2010.hmod/etc/libretro/info/snes9x2010_libretro.info b/core_modules_extra/snes9x2010.hmod/etc/libretro/info/snes9x2010_libretro.info
similarity index 100%
rename from core_modules/snes9x2010.hmod/etc/libretro/info/snes9x2010_libretro.info
rename to core_modules_extra/snes9x2010.hmod/etc/libretro/info/snes9x2010_libretro.info
diff --git a/core_modules_extra/snes9x2005.hmod/install b/core_modules_extra/snes9x2010.hmod/install
similarity index 100%
rename from core_modules_extra/snes9x2005.hmod/install
rename to core_modules_extra/snes9x2010.hmod/install
diff --git a/core_modules/snes9x2010.hmod/readme.txt b/core_modules_extra/snes9x2010.hmod/readme.txt
similarity index 75%
rename from core_modules/snes9x2010.hmod/readme.txt
rename to core_modules_extra/snes9x2010.hmod/readme.txt
index 6b0d277..18b3279 100644
--- a/core_modules/snes9x2010.hmod/readme.txt
+++ b/core_modules_extra/snes9x2010.hmod/readme.txt
@@ -1,9 +1,10 @@
 === SNES9x2010 core for RetroArch ===
 
 This module will add support for Super Famicom / Super Nintendo games to RetroArch
+Due to some bug in the core savestates do not work properly.
 
 Available executables and arguments:
-- /bin/snes <rom> <clover_args>
+- /bin/snes10 <rom> <clover_args>
   runs "snes9x2010" core
 
 Core by libretro (Lakka for Raspberry Pi 2/3)
diff --git a/core_modules_extra/snes9x2005.hmod/bin/snes05 b/core_modules_extra/use_snes9x2002.hmod/bin/snes05
similarity index 100%
rename from core_modules_extra/snes9x2005.hmod/bin/snes05
rename to core_modules_extra/use_snes9x2002.hmod/bin/snes05
diff --git a/core_modules_extra/use_snes9x2002.hmod/bin/snes10 b/core_modules_extra/use_snes9x2002.hmod/bin/snes10
deleted file mode 100755
index 215b4ab..0000000
--- a/core_modules_extra/use_snes9x2002.hmod/bin/snes10
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec retroarch-clover snes9x2010 "$@"
diff --git a/core_modules_extra/use_snes9x2005.hmod/bin/snes10 b/core_modules_extra/use_snes9x2005.hmod/bin/snes10
deleted file mode 100755
index 215b4ab..0000000
--- a/core_modules_extra/use_snes9x2005.hmod/bin/snes10
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec retroarch-clover snes9x2010 "$@"
diff --git a/core_modules/snes9x2010.hmod/bin/snes b/core_modules_extra/use_snes9x2010.hmod/bin/snes
similarity index 100%
rename from core_modules/snes9x2010.hmod/bin/snes
rename to core_modules_extra/use_snes9x2010.hmod/bin/snes
diff --git a/core_modules_extra/use_snes9x2010.hmod/bin/snes05 b/core_modules_extra/use_snes9x2010.hmod/bin/snes05
new file mode 100755
index 0000000..f35fbb7
--- /dev/null
+++ b/core_modules_extra/use_snes9x2010.hmod/bin/snes05
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec retroarch-clover snes9x2005 "$@"
diff --git a/core_modules_extra/use_snes9x2005.hmod/install b/core_modules_extra/use_snes9x2010.hmod/install
similarity index 100%
rename from core_modules_extra/use_snes9x2005.hmod/install
rename to core_modules_extra/use_snes9x2010.hmod/install
diff --git a/core_modules_extra/use_snes9x2005.hmod/readme.txt b/core_modules_extra/use_snes9x2010.hmod/readme.txt
similarity index 50%
rename from core_modules_extra/use_snes9x2005.hmod/readme.txt
rename to core_modules_extra/use_snes9x2010.hmod/readme.txt
index a3cc151..2b06857 100644
--- a/core_modules_extra/use_snes9x2005.hmod/readme.txt
+++ b/core_modules_extra/use_snes9x2010.hmod/readme.txt
@@ -1,13 +1,13 @@
-=== Use SNES9x2005 instead of SNES9x2010 ===
+=== Use SNES9x2010 instead of SNES9x2005 ===
 
-This module will patch /bin/snes file to use SNES9x2005 instead of SNES9x2010.
-Make sure that snes9x2005 module is installed before installing this.
+This module will patch /bin/snes file to use SNES9x2010 instead of SNES9x2005.
+Make sure that snes9x2010 module is installed before installing this.
 
 Available executables and arguments:
 - /bin/snes <rom> <clover_args>
-  runs "snes9x2005" core
-- /bin/snes10 <rom> <clover_args>
   runs "snes9x2010" core
+- /bin/snes05 <rom> <clover_args>
+  runs "snes9x2005" core
 
 Cores by libretro
 Module by pcm