diff --git a/shmserver/CMakeLists.txt b/dfhack/shm/CMakeLists.txt
similarity index 100%
rename from shmserver/CMakeLists.txt
rename to dfhack/shm/CMakeLists.txt
diff --git a/shmserver/mod-core.cpp b/dfhack/shm/mod-core.cpp
similarity index 100%
rename from shmserver/mod-core.cpp
rename to dfhack/shm/mod-core.cpp
diff --git a/shmserver/mod-core.h b/dfhack/shm/mod-core.h
similarity index 100%
rename from shmserver/mod-core.h
rename to dfhack/shm/mod-core.h
diff --git a/shmserver/mod-creature40d.cpp b/dfhack/shm/mod-creature40d.cpp
similarity index 100%
rename from shmserver/mod-creature40d.cpp
rename to dfhack/shm/mod-creature40d.cpp
diff --git a/shmserver/mod-creature40d.h b/dfhack/shm/mod-creature40d.h
similarity index 100%
rename from shmserver/mod-creature40d.h
rename to dfhack/shm/mod-creature40d.h
diff --git a/shmserver/mod-maps.cpp b/dfhack/shm/mod-maps.cpp
similarity index 100%
rename from shmserver/mod-maps.cpp
rename to dfhack/shm/mod-maps.cpp
diff --git a/shmserver/mod-maps.h b/dfhack/shm/mod-maps.h
similarity index 100%
rename from shmserver/mod-maps.h
rename to dfhack/shm/mod-maps.h
diff --git a/shmserver/readme.txt b/dfhack/shm/readme.txt
similarity index 100%
rename from shmserver/readme.txt
rename to dfhack/shm/readme.txt
diff --git a/shmserver/shms-linux.cpp b/dfhack/shm/shms-linux.cpp
similarity index 100%
rename from shmserver/shms-linux.cpp
rename to dfhack/shm/shms-linux.cpp
diff --git a/shmserver/shms-windows.cpp b/dfhack/shm/shms-windows.cpp
similarity index 100%
rename from shmserver/shms-windows.cpp
rename to dfhack/shm/shms-windows.cpp
diff --git a/shmserver/shms.h b/dfhack/shm/shms.h
similarity index 100%
rename from shmserver/shms.h
rename to dfhack/shm/shms.h