diff --git a/sfw/render_core/object.cpp b/sfw/object/object.cpp
similarity index 100%
rename from sfw/render_core/object.cpp
rename to sfw/object/object.cpp
diff --git a/sfw/render_core/object.h b/sfw/object/object.h
similarity index 100%
rename from sfw/render_core/object.h
rename to sfw/object/object.h
diff --git a/sfw/render_core/psignal.cpp b/sfw/object/psignal.cpp
similarity index 100%
rename from sfw/render_core/psignal.cpp
rename to sfw/object/psignal.cpp
diff --git a/sfw/render_core/psignal.h b/sfw/object/psignal.h
similarity index 100%
rename from sfw/render_core/psignal.h
rename to sfw/object/psignal.h
diff --git a/sfw/render_core/random_number_generator.cpp b/sfw/object/random_number_generator.cpp
similarity index 100%
rename from sfw/render_core/random_number_generator.cpp
rename to sfw/object/random_number_generator.cpp
diff --git a/sfw/render_core/random_number_generator.h b/sfw/object/random_number_generator.h
similarity index 100%
rename from sfw/render_core/random_number_generator.h
rename to sfw/object/random_number_generator.h
diff --git a/sfw/render_core/reference.cpp b/sfw/object/reference.cpp
similarity index 100%
rename from sfw/render_core/reference.cpp
rename to sfw/object/reference.cpp
diff --git a/sfw/render_core/reference.h b/sfw/object/reference.h
similarity index 100%
rename from sfw/render_core/reference.h
rename to sfw/object/reference.h
diff --git a/sfw/render_core/variant.cpp b/sfw/object/variant.cpp
similarity index 100%
rename from sfw/render_core/variant.cpp
rename to sfw/object/variant.cpp
diff --git a/sfw/render_core/variant.h b/sfw/object/variant.h
similarity index 100%
rename from sfw/render_core/variant.h
rename to sfw/object/variant.h
diff --git a/sfw/render_core/input/SCsub b/sfw/render_objects/input/SCsub
similarity index 100%
rename from sfw/render_core/input/SCsub
rename to sfw/render_objects/input/SCsub
diff --git a/sfw/render_core/input/default_controller_mappings.gen.cpp b/sfw/render_objects/input/default_controller_mappings.gen.cpp
similarity index 100%
rename from sfw/render_core/input/default_controller_mappings.gen.cpp
rename to sfw/render_objects/input/default_controller_mappings.gen.cpp
diff --git a/sfw/render_core/input/default_controller_mappings.h b/sfw/render_objects/input/default_controller_mappings.h
similarity index 100%
rename from sfw/render_core/input/default_controller_mappings.h
rename to sfw/render_objects/input/default_controller_mappings.h
diff --git a/sfw/render_core/input/gamecontrollerdb.txt b/sfw/render_objects/input/gamecontrollerdb.txt
similarity index 100%
rename from sfw/render_core/input/gamecontrollerdb.txt
rename to sfw/render_objects/input/gamecontrollerdb.txt
diff --git a/sfw/render_core/input/input.cpp b/sfw/render_objects/input/input.cpp
similarity index 100%
rename from sfw/render_core/input/input.cpp
rename to sfw/render_objects/input/input.cpp
diff --git a/sfw/render_core/input/input.h b/sfw/render_objects/input/input.h
similarity index 100%
rename from sfw/render_core/input/input.h
rename to sfw/render_objects/input/input.h
diff --git a/sfw/render_core/input/input_builders.py b/sfw/render_objects/input/input_builders.py
similarity index 100%
rename from sfw/render_core/input/input_builders.py
rename to sfw/render_objects/input/input_builders.py
diff --git a/sfw/render_core/input/input_event.cpp b/sfw/render_objects/input/input_event.cpp
similarity index 100%
rename from sfw/render_core/input/input_event.cpp
rename to sfw/render_objects/input/input_event.cpp
diff --git a/sfw/render_core/input/input_event.h b/sfw/render_objects/input/input_event.h
similarity index 100%
rename from sfw/render_core/input/input_event.h
rename to sfw/render_objects/input/input_event.h
diff --git a/sfw/render_core/input/input_map.cpp b/sfw/render_objects/input/input_map.cpp
similarity index 100%
rename from sfw/render_core/input/input_map.cpp
rename to sfw/render_objects/input/input_map.cpp
diff --git a/sfw/render_core/input/input_map.h b/sfw/render_objects/input/input_map.h
similarity index 100%
rename from sfw/render_core/input/input_map.h
rename to sfw/render_objects/input/input_map.h
diff --git a/sfw/render_core/input/pandemoniumcontrollerdb.txt b/sfw/render_objects/input/pandemoniumcontrollerdb.txt
similarity index 100%
rename from sfw/render_core/input/pandemoniumcontrollerdb.txt
rename to sfw/render_objects/input/pandemoniumcontrollerdb.txt
diff --git a/sfw/render_core/input/shortcut.cpp b/sfw/render_objects/input/shortcut.cpp
similarity index 100%
rename from sfw/render_core/input/shortcut.cpp
rename to sfw/render_objects/input/shortcut.cpp
diff --git a/sfw/render_core/input/shortcut.h b/sfw/render_objects/input/shortcut.h
similarity index 100%
rename from sfw/render_core/input/shortcut.h
rename to sfw/render_objects/input/shortcut.h