diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80750a7..2ba97e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,12 +12,7 @@ include(cmake/FindSDL2_mixer.cmake)
 include(cmake/FindSDL2_ttf.cmake)
 include(cmake/FindCheck.cmake)
 
-add_subdirectory(linkedlist)
-add_subdirectory(hashtable)
-
 include_directories(
-	linkedlist
-	hashtable
 	${LUA_INCLUDE_DIR}
 	${SDL2_INCLUDE_DIR}
 	${SDL2_IMAGE_INCLUDE_DIR}
@@ -47,11 +42,11 @@ add_executable(breakhack
 	src/stats
 	src/actiontext
 	src/random
+	src/linkedlist
+	src/hashtable
 	)
 
 target_link_libraries(breakhack
-	linkedlist
-	hashtable
 	${LUA_LIBRARY}
 	${SDL2_LIBRARY}
 	${SDL2_IMAGE_LIBRARY}
@@ -67,4 +62,12 @@ IF (CHECK_FOUND)
 	add_executable(test_util test/check_util src/util)
 	target_link_libraries(test_util ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 	add_test(test_util test_util)
+
+	add_executable(test_linkedlist test/check_linkedlist src/linkedlist)
+	target_link_libraries(test_linkedlist ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+	add_test(test_linkedlist test_linkedlist)
+
+	add_executable(test_hashtable test/check_hashtable src/hashtable)
+	target_link_libraries(test_hashtable ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+	add_test(test_hashtable test_hashtable)
 ENDIF (CHECK_FOUND)
diff --git a/hashtable/CMakeLists.txt b/hashtable/CMakeLists.txt
deleted file mode 100644
index 96dc8e8..0000000
--- a/hashtable/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required (VERSION 3.2.0)
-
-SET(CMAKE_COLOR_MAKEFILE ON)
-
-include("../cmake/FindCheck.cmake")
-
-project(hashtable C)
-
-add_definitions("-Wall")
-
-add_library(hashtable hashtable.c)
-
-include_directories(${CHECK_INCLUDE_DIR})
-
-if (CHECK_FOUND)
-	find_package(Threads REQUIRED)
-	enable_testing()
-	add_executable(test_table check_hashtable hashtable)
-	target_compile_options(test_table PRIVATE -pthread)
-	target_link_libraries(test_table ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-	add_test(test_table test_table)
-endif (CHECK_FOUND)
diff --git a/linkedlist/CMakeLists.txt b/linkedlist/CMakeLists.txt
deleted file mode 100644
index c232821..0000000
--- a/linkedlist/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required (VERSION 3.2.0)
-
-SET(CMAKE_COLOR_MAKEFILE ON)
-
-include("../cmake/FindCheck.cmake")
-
-project(linkedlist C)
-
-add_definitions("-Wall")
-
-add_library(linkedlist linkedlist.c)
-
-include_directories(${CHECK_INCLUDE_DIR})
-
-if (CHECK_FOUND)
-	find_package(Threads REQUIRED)
-	enable_testing()
-	add_executable(test_list check_linkedlist linkedlist)
-	target_compile_options(test_list PRIVATE -pthread)
-	target_link_libraries(test_list ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-	add_test(test_list test_list)
-endif (CHECK_FOUND)
diff --git a/hashtable/hashtable.c b/src/hashtable.c
similarity index 100%
rename from hashtable/hashtable.c
rename to src/hashtable.c
diff --git a/hashtable/hashtable.h b/src/hashtable.h
similarity index 100%
rename from hashtable/hashtable.h
rename to src/hashtable.h
diff --git a/linkedlist/linkedlist.c b/src/linkedlist.c
similarity index 100%
rename from linkedlist/linkedlist.c
rename to src/linkedlist.c
diff --git a/linkedlist/linkedlist.h b/src/linkedlist.h
similarity index 100%
rename from linkedlist/linkedlist.h
rename to src/linkedlist.h
diff --git a/src/main.c b/src/main.c
index 9278486..98d8f3d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,8 +2,8 @@
 #include <stdbool.h>
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>
-#include <linkedlist.h>
 
+#include "linkedlist.h"
 #include "player.h"
 #include "screenresolution.h"
 #include "dimension.h"
diff --git a/src/map.h b/src/map.h
index 2906c2e..c8fd582 100644
--- a/src/map.h
+++ b/src/map.h
@@ -3,9 +3,9 @@
 
 #include <SDL2/SDL.h>
 #include <stdbool.h>
-#include <linkedlist.h>
-#include <hashtable.h>
 
+#include "hashtable.h"
+#include "linkedlist.h"
 #include "sprite.h"
 #include "camera.h"
 #include "position.h"
diff --git a/hashtable/check_hashtable.c b/test/check_hashtable.c
similarity index 98%
rename from hashtable/check_hashtable.c
rename to test/check_hashtable.c
index 6faaa50..df01e71 100644
--- a/hashtable/check_hashtable.c
+++ b/test/check_hashtable.c
@@ -1,6 +1,6 @@
 #include <check.h>
 #include <stdlib.h>
-#include "hashtable.h"
+#include "../src/hashtable.h"
 
 START_TEST(test_hashtable_create)
 {
diff --git a/linkedlist/check_linkedlist.c b/test/check_linkedlist.c
similarity index 99%
rename from linkedlist/check_linkedlist.c
rename to test/check_linkedlist.c
index f130dcf..7419efb 100644
--- a/linkedlist/check_linkedlist.c
+++ b/test/check_linkedlist.c
@@ -1,7 +1,7 @@
 #include <check.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "linkedlist.h"
+#include "../src/linkedlist.h"
 
 START_TEST(test_linkedlist_create)
 {