diff --git a/modules/Makefile.am b/modules/Makefile.am
index f2dbc715f..e5379a99d 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -256,18 +256,16 @@ media_module_LTLIBRARIES = \
 
 if JS
 
-server_moduledir = @moduledir@
+js_moduledir = @moduledir@
 
-server_server_console_la_SOURCES = server/console.cc
-server_server_listener_la_SOURCES = server/listener.cc
+js_js_console_la_SOURCES = js/console.cc
+js_js_listener_la_SOURCES = js/listener.cc
+js_js_kernel_la_SOURCES = js/kernel.cc
 
-server_module_LTLIBRARIES = \
-	server/server_console.la \
-	server/server_listener.la \
-	###
-
-module_LTLIBRARIES += \
-	kernel.la \
+js_module_LTLIBRARIES = \
+	js/js_console.la \
+	js/js_listener.la \
+	js/js_kernel.la \
 	###
 
 endif
diff --git a/modules/server/console.cc b/modules/js/console.cc
similarity index 100%
rename from modules/server/console.cc
rename to modules/js/console.cc
diff --git a/modules/kernel.cc b/modules/js/kernel.cc
similarity index 100%
rename from modules/kernel.cc
rename to modules/js/kernel.cc
diff --git a/modules/server/listener.cc b/modules/js/listener.cc
similarity index 100%
rename from modules/server/listener.cc
rename to modules/js/listener.cc