diff --git a/core/Makefile b/core/Makefile
index 1eb2df101..9888c2e28 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -10,7 +10,7 @@
 ##
 ## License: GPLv3
 EMACS_DIR=~/.emacs.d/
-TEST_DIR=$(EMACS_DIR)core/test/
+TEST_DIR=$(EMACS_DIR)core/tests/
 
 all: test
 
diff --git a/core/lib/ht.el b/core/libs/ht.el
similarity index 100%
rename from core/lib/ht.el
rename to core/libs/ht.el
diff --git a/core/lib/mocker.el b/core/libs/mocker.el
similarity index 100%
rename from core/lib/mocker.el
rename to core/libs/mocker.el
diff --git a/core/load-paths.el b/core/load-paths.el
index 7b8d66a7f..9c389beaf 100644
--- a/core/load-paths.el
+++ b/core/load-paths.el
@@ -14,5 +14,5 @@
 (mapc 'add-to-load-path
       `(
         ,(concat user-emacs-directory "core/")
-        ,(concat user-emacs-directory "core/lib/")
+        ,(concat user-emacs-directory "core/libs/")
         ))
diff --git a/core/test/configuration-layer-utest.el b/core/tests/configuration-layer-utest.el
similarity index 100%
rename from core/test/configuration-layer-utest.el
rename to core/tests/configuration-layer-utest.el