--- a/tests/CMakeLists.txt	Thu Dec 14 21:51:22 2017 +0100
+++ b/tests/CMakeLists.txt	Fri Dec 15 15:37:58 2017 +0100
@@ -19,60 +19,11 @@
 # Project
 project(tests)
 
-# Transport commands.
-add_subdirectory(src/plugin-config-command)
-add_subdirectory(src/plugin-info-command)
-add_subdirectory(src/plugin-list-command)
-add_subdirectory(src/plugin-load-command)
-add_subdirectory(src/plugin-reload-command)
-add_subdirectory(src/plugin-unload-command)
-add_subdirectory(src/rule-add-command)
-add_subdirectory(src/rule-edit-command)
-add_subdirectory(src/rule-info-command)
-add_subdirectory(src/rule-list-command)
-add_subdirectory(src/rule-move-command)
-add_subdirectory(src/rule-remove-command)
-add_subdirectory(src/server-connect-command)
-add_subdirectory(src/server-disconnect-command)
-add_subdirectory(src/server-info-command)
-add_subdirectory(src/server-invite-command)
-add_subdirectory(src/server-join-command)
-add_subdirectory(src/server-kick-command)
-add_subdirectory(src/server-list-command)
-add_subdirectory(src/server-me-command)
-add_subdirectory(src/server-message-command)
-add_subdirectory(src/server-mode-command)
-add_subdirectory(src/server-nick-command)
-add_subdirectory(src/server-notice-command)
-add_subdirectory(src/server-part-command)
-add_subdirectory(src/server-reconnect-command)
-add_subdirectory(src/server-topic-command)
-
-# Miscellaneous functions.
-add_subdirectory(src/dynlib-plugin)
-add_subdirectory(src/irc)
-add_subdirectory(src/logger)
-add_subdirectory(src/rules)
-add_subdirectory(src/util)
+# libirccd
+add_subdirectory(src/libirccd)
 
 # Javascript API and plugins.
 if (HAVE_JS)
-    add_subdirectory(src/js-plugin)
-
-    add_subdirectory(src/elapsedtimer-jsapi)
-    add_subdirectory(src/directory-jsapi)
-    add_subdirectory(src/file-jsapi)
-    add_subdirectory(src/irccd-jsapi)
-    add_subdirectory(src/logger-jsapi)
-    add_subdirectory(src/system-jsapi)
-    add_subdirectory(src/timer-jsapi)
-    add_subdirectory(src/unicode-jsapi)
-    add_subdirectory(src/util-jsapi)
-
-    add_subdirectory(src/plugin-ask)
-    add_subdirectory(src/plugin-auth)
-    add_subdirectory(src/plugin-hangman)
-    add_subdirectory(src/plugin-history)
-    add_subdirectory(src/plugin-logger)
-    add_subdirectory(src/plugin-plugin)
+    add_subdirectory(src/plugins)
+    add_subdirectory(src/libirccd-js)
 endif ()