diff --git a/Makefile.common b/Makefile.common
index 22fa99f811..a88914d8e5 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -272,7 +272,7 @@ OBJ += \
 
 ifeq ($(HAVE_REWIND), 1)
 DEFINES += -DHAVE_REWIND
-OBJ     += managers/state_manager.o
+OBJ     += state_manager.o
 endif
 
 OBJ += \
@@ -286,7 +286,7 @@ OBJ += \
 
 ifeq ($(HAVE_CHEATS), 1)
    DEFINES += -DHAVE_CHEATS
-   OBJ     += managers/cheat_manager.o
+   OBJ     += cheat_manager.o
 endif
 
 OBJ += \
diff --git a/managers/cheat_manager.c b/cheat_manager.c
similarity index 99%
rename from managers/cheat_manager.c
rename to cheat_manager.c
index 4fedcc6bb0..5df70be982 100644
--- a/managers/cheat_manager.c
+++ b/cheat_manager.c
@@ -29,25 +29,25 @@
 #include <features/features_cpu.h>
 
 #ifdef HAVE_CONFIG_H
-#include "../config.h"
+#include "config.h"
 #endif
 
 #ifdef HAVE_MENU
-#include "../menu/menu_driver.h"
+#include "menu/menu_driver.h"
 #endif
 
 #ifdef HAVE_CHEEVOS
-#include "../cheevos/cheevos.h"
+#include "cheevos/cheevos.h"
 #endif
 
 #include "cheat_manager.h"
 
-#include "../msg_hash.h"
-#include "../configuration.h"
-#include "../retroarch.h"
-#include "../dynamic.h"
-#include "../core.h"
-#include "../verbosity.h"
+#include "msg_hash.h"
+#include "configuration.h"
+#include "retroarch.h"
+#include "dynamic.h"
+#include "core.h"
+#include "verbosity.h"
 
 /* TODO/FIXME - public global variables */
 cheat_manager_t cheat_manager_state;
diff --git a/managers/cheat_manager.h b/cheat_manager.h
similarity index 100%
rename from managers/cheat_manager.h
rename to cheat_manager.h
diff --git a/managers/core_option_manager.h b/core_option_manager.h
similarity index 100%
rename from managers/core_option_manager.h
rename to core_option_manager.h
diff --git a/gfx/common/metal_common.m b/gfx/common/metal_common.m
index 8b87bdd880..f2d4ac35df 100644
--- a/gfx/common/metal_common.m
+++ b/gfx/common/metal_common.m
@@ -30,7 +30,7 @@
 #include "../../ui/drivers/cocoa/cocoa_common.h"
 
 #ifdef HAVE_REWIND
-#include "../../managers/state_manager.h"
+#include "../../state_manager.h"
 #endif
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
@@ -1003,14 +1003,10 @@ typedef struct MTLALIGN(16)
 
 #ifdef HAVE_REWIND
       if (state_manager_frame_is_reversed())
-      {
          _engine.pass[i].frame_direction = -1;
-      }
       else
 #else
-      {
          _engine.pass[i].frame_direction = 1;
-      }
 #endif
 
       for (unsigned j = 0; j < SLANG_CBUFFER_MAX; j++)
diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c
index 135cab47f0..85db1b2ac1 100644
--- a/gfx/drivers/d3d10.c
+++ b/gfx/drivers/d3d10.c
@@ -32,7 +32,7 @@
 #include "../../configuration.h"
 #include "../../retroarch.h"
 #ifdef HAVE_REWIND
-#include "../../managers/state_manager.h"
+#include "../../state_manager.h"
 #endif
 
 #include "../font_driver.h"
diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c
index 647c548cef..706f44033b 100644
--- a/gfx/drivers/d3d11.c
+++ b/gfx/drivers/d3d11.c
@@ -47,7 +47,7 @@
 #include "../video_shader_parse.h"
 #include "../drivers_shader/slang_process.h"
 #ifdef HAVE_REWIND
-#include "../../managers/state_manager.h"
+#include "../../state_manager.h"
 #endif
 
 #include "../common/d3d_common.h"
diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c
index bacb9b2e5f..41f8af3e64 100644
--- a/gfx/drivers/d3d12.c
+++ b/gfx/drivers/d3d12.c
@@ -34,7 +34,7 @@
 #include "../../configuration.h"
 #include "../../retroarch.h"
 #ifdef HAVE_REWIND
-#include "../../managers/state_manager.h"
+#include "../../state_manager.h"
 #endif
 
 #ifdef HAVE_MENU
diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c
index 6ae26a4869..8eefa95396 100644
--- a/gfx/drivers/gl_core.c
+++ b/gfx/drivers/gl_core.c
@@ -34,7 +34,7 @@
 #include "../../configuration.h"
 #include "../../dynamic.h"
 #ifdef HAVE_REWIND
-#include "../../managers/state_manager.h"
+#include "../../state_manager.h"
 #endif
 
 #include "../../retroarch.h"
diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c
index 2457ab95df..834caec0fe 100644
--- a/gfx/drivers/gx2_gfx.c
+++ b/gfx/drivers/gx2_gfx.c
@@ -27,7 +27,7 @@
 #include "../../retroarch.h"
 
 #ifdef HAVE_REWIND
-#include "../../managers/state_manager.h"
+#include "../../state_manager.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 6344f875dc..73ce2230bb 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -47,7 +47,7 @@
 #include "../../driver.h"
 #include "../../configuration.h"
 #ifdef HAVE_REWIND
-#include "../../managers/state_manager.h"
+#include "../../state_manager.h"
 #endif
 
 #include "../../retroarch.h"
diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
index 6240a67929..4c9b2cf890 100644
--- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
+++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
@@ -33,7 +33,7 @@
 #include "../common/d3d9_common.h"
 
 #include "../video_shader_parse.h"
-#include "../../managers/state_manager.h"
+#include "../../state_manager.h"
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 
diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 7a3d4ac131..e8f06f74e0 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -50,7 +50,7 @@
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 #ifdef HAVE_REWIND
-#include "../../managers/state_manager.h"
+#include "../../state_manager.h"
 #endif
 
 #define PREV_TEXTURES         (GFX_MAX_TEXTURES - 1)
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 83491fe2cb..9f4b7756cd 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -35,7 +35,7 @@
 
 #include "shader_glsl.h"
 #ifdef HAVE_REWIND
-#include "../../managers/state_manager.h"
+#include "../../state_manager.h"
 #endif
 #include "../../core.h"
 #include "../../verbosity.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 6bec2b5e47..bc1828d53b 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -227,7 +227,7 @@ MD5
 CHEATS
 ============================================================ */
 #ifdef HAVE_CHEATS
-#include "../managers/cheat_manager.c"
+#include "../cheat_manager.c"
 #endif
 #include "../libretro-common/hash/rhash.c"
 
@@ -1104,7 +1104,7 @@ CONFIGURATION
 STATE MANAGER
 ============================================================ */
 #ifdef HAVE_REWIND
-#include "../managers/state_manager.c"
+#include "../state_manager.c"
 #endif
 
 /*============================================================
diff --git a/menu/cbs/menu_cbs_cancel.c b/menu/cbs/menu_cbs_cancel.c
index 3fe2f4eded..6ad471831a 100644
--- a/menu/cbs/menu_cbs_cancel.c
+++ b/menu/cbs/menu_cbs_cancel.c
@@ -21,7 +21,7 @@
 #include "../../configuration.h"
 #include "../../msg_hash.h"
 #ifdef HAVE_CHEATS
-#include "../../managers/cheat_manager.h"
+#include "../../cheat_manager.h"
 #endif
 
 #ifndef BIND_ACTION_CANCEL
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index f082dcd5ff..69231710bd 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -35,9 +35,9 @@
 #include "../../core_info.h"
 #include "../../configuration.h"
 #include "../../file_path_special.h"
-#include "../../managers/core_option_manager.h"
+#include "../../core_option_manager.h"
 #ifdef HAVE_CHEATS
-#include "../../managers/cheat_manager.h"
+#include "../../cheat_manager.h"
 #endif
 #include "../../performance_counters.h"
 #include "../../paths.h"
diff --git a/menu/cbs/menu_cbs_label.c b/menu/cbs/menu_cbs_label.c
index c9b801ceec..3e69deb926 100644
--- a/menu/cbs/menu_cbs_label.c
+++ b/menu/cbs/menu_cbs_label.c
@@ -21,7 +21,7 @@
 #include "../menu_cbs.h"
 #include "../../file_path_special.h"
 #ifdef HAVE_CHEATS
-#include "../../managers/cheat_manager.h"
+#include "../../cheat_manager.h"
 #endif
 
 #ifndef BIND_ACTION_LABEL
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 0fc5f80583..e461a78bbd 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -35,7 +35,7 @@
 #include "../../core.h"
 #include "../../core_info.h"
 #ifdef HAVE_CHEATS
-#include "../../managers/cheat_manager.h"
+#include "../../cheat_manager.h"
 #endif
 #include "../../file_path_special.h"
 #include "../../driver.h"
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index de632ea8c1..58380227d9 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -56,9 +56,9 @@
 #include "../../core_info.h"
 #include "../../frontend/frontend_driver.h"
 #include "../../defaults.h"
-#include "../../managers/core_option_manager.h"
+#include "../../core_option_manager.h"
 #ifdef HAVE_CHEATS
-#include "../../managers/cheat_manager.h"
+#include "../../cheat_manager.h"
 #endif
 #ifdef HAVE_AUDIOMIXER
 #include "../../tasks/task_audio_mixer.h"
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 17725658d8..90c0e5e6d7 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -35,7 +35,7 @@
 #include "../../core.h"
 #include "../../core_info.h"
 #ifdef HAVE_CHEATS
-#include "../../managers/cheat_manager.h"
+#include "../../cheat_manager.h"
 #endif
 #include "../../file_path_special.h"
 #include "../../retroarch.h"
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index c459686fd1..275490ff65 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -33,9 +33,9 @@
 #include "../../configuration.h"
 #include "../../core.h"
 #include "../../core_info.h"
-#include "../../managers/core_option_manager.h"
+#include "../../core_option_manager.h"
 #ifdef HAVE_CHEATS
-#include "../../managers/cheat_manager.h"
+#include "../../cheat_manager.h"
 #endif
 #include "../../retroarch.h"
 #include "../../verbosity.h"
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index cca07d167d..7a1ed49601 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -23,7 +23,7 @@
 #include "../menu_cbs.h"
 
 #include "../../retroarch.h"
-#include "../../managers/core_option_manager.h"
+#include "../../core_option_manager.h"
 
 #ifdef HAVE_CHEEVOS
 #include "../../cheevos/cheevos.h"
@@ -45,7 +45,7 @@
 #include "../../core_updater_list.h"
 #endif
 #ifdef HAVE_CHEATS
-#include "../../managers/cheat_manager.h"
+#include "../../cheat_manager.h"
 #endif
 #include "../../tasks/tasks_internal.h"
 
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index a3b2301a85..88ca86caad 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -24,7 +24,7 @@
 
 #include "../../retroarch.h"
 #include "../../configuration.h"
-#include "../../managers/core_option_manager.h"
+#include "../../core_option_manager.h"
 #include "../../core_info.h"
 
 #ifndef BIND_ACTION_GET_TITLE
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index da4a7699a0..8617434d8e 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -84,9 +84,9 @@
 #include "../defaults.h"
 #include "../verbosity.h"
 #ifdef HAVE_CHEATS
-#include "../managers/cheat_manager.h"
+#include "../cheat_manager.h"
 #endif
-#include "../managers/core_option_manager.h"
+#include "../core_option_manager.h"
 #include "../paths.h"
 #include "../retroarch.h"
 #include "../core.h"
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 4de5e5f25a..98396950c0 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -96,7 +96,7 @@
 #include "../retroarch.h"
 #include "../gfx/video_display_server.h"
 #ifdef HAVE_CHEATS
-#include "../managers/cheat_manager.h"
+#include "../cheat_manager.h"
 #endif
 #include "../verbosity.h"
 #include "../playlist.h"
diff --git a/retroarch.c b/retroarch.c
index 9ea570d9d5..9a02b0e473 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -232,12 +232,12 @@
 #include "core.h"
 #include "configuration.h"
 #include "list_special.h"
-#include "managers/core_option_manager.h"
+#include "core_option_manager.h"
 #ifdef HAVE_CHEATS
-#include "managers/cheat_manager.h"
+#include "cheat_manager.h"
 #endif
 #ifdef HAVE_REWIND
-#include "managers/state_manager.h"
+#include "state_manager.h"
 #endif
 #ifdef HAVE_AUDIOMIXER
 #include "tasks/task_audio_mixer.h"
diff --git a/managers/state_manager.c b/state_manager.c
similarity index 99%
rename from managers/state_manager.c
rename to state_manager.c
index b98d71aabf..9f5e12ea2f 100644
--- a/managers/state_manager.c
+++ b/state_manager.c
@@ -28,13 +28,13 @@
 #include <compat/intrinsics.h>
 
 #include "state_manager.h"
-#include "../msg_hash.h"
-#include "../core.h"
-#include "../retroarch.h"
-#include "../verbosity.h"
+#include "msg_hash.h"
+#include "core.h"
+#include "retroarch.h"
+#include "verbosity.h"
 
 #ifdef HAVE_NETWORKING
-#include "../network/netplay/netplay.h"
+#include "network/netplay/netplay.h"
 #endif
 
 /* This makes Valgrind throw errors if a core overflows its savestate size. */
diff --git a/managers/state_manager.h b/state_manager.h
similarity index 100%
rename from managers/state_manager.h
rename to state_manager.h
diff --git a/tasks/task_save.c b/tasks/task_save.c
index 08e4ac8e3d..dfdab2da94 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -55,7 +55,7 @@
 #include "../verbosity.h"
 #include "tasks_internal.h"
 #ifdef HAVE_CHEATS
-#include "../managers/cheat_manager.h"
+#include "../cheat_manager.h"
 #endif
 
 #if defined(HAVE_LIBNX) || defined(_3DS)