diff --git a/client/button.cpp b/common/button.cpp
similarity index 100%
rename from client/button.cpp
rename to common/button.cpp
diff --git a/client/button.hpp b/common/button.hpp
similarity index 100%
rename from client/button.hpp
rename to common/button.hpp
diff --git a/client/frame_rate.cpp b/common/frame_rate.cpp
similarity index 100%
rename from client/frame_rate.cpp
rename to common/frame_rate.cpp
diff --git a/client/frame_rate.hpp b/common/frame_rate.hpp
similarity index 100%
rename from client/frame_rate.hpp
rename to common/frame_rate.hpp
diff --git a/client/image.cpp b/common/image.cpp
similarity index 100%
rename from client/image.cpp
rename to common/image.cpp
diff --git a/client/image.hpp b/common/image.hpp
similarity index 100%
rename from client/image.hpp
rename to common/image.hpp
diff --git a/client/raster_font.cpp b/common/raster_font.cpp
similarity index 100%
rename from client/raster_font.cpp
rename to common/raster_font.cpp
diff --git a/client/raster_font.hpp b/common/raster_font.hpp
similarity index 100%
rename from client/raster_font.hpp
rename to common/raster_font.hpp
diff --git a/client/sprite_sheet.cpp b/common/sprite_sheet.cpp
similarity index 100%
rename from client/sprite_sheet.cpp
rename to common/sprite_sheet.cpp
diff --git a/client/sprite_sheet.hpp b/common/sprite_sheet.hpp
similarity index 100%
rename from client/sprite_sheet.hpp
rename to common/sprite_sheet.hpp
diff --git a/client/surface_manager.cpp b/common/surface_manager.cpp
similarity index 100%
rename from client/surface_manager.cpp
rename to common/surface_manager.cpp
diff --git a/client/surface_manager.hpp b/common/surface_manager.hpp
similarity index 100%
rename from client/surface_manager.hpp
rename to common/surface_manager.hpp