diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index f11c7b610..65724fff1 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -21,9 +21,9 @@
 ##   Fifth Floor, Boston, MA 02110-1301 USA
 
 include $(top_srcdir)/am/snarf
-include $(top_srcdir)/libguile/lightning/lightning.am
+include $(top_srcdir)/libguile/lightening/lightening.am
 
-AUTOMAKE_OPTIONS = gnu subdir-objects
+AUTOMAKE_OPTIONS = gnu
 
 ## Prevent automake from adding extra -I options
 DEFS = @DEFS@
@@ -41,7 +41,7 @@ AM_CPPFLAGS = -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) \
 	      $(LIBFFI_CFLAGS)
 
 if ENABLE_JIT
-AM_CPPFLAGS += -I$(top_srcdir)/libguile/lightning
+AM_CPPFLAGS += -I$(top_srcdir)/libguile/lightening
 endif
 
 AM_CFLAGS = $(GCC_CFLAGS) $(CFLAG_VISIBILITY)
@@ -238,7 +238,7 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =				\
 	weak-vector.c
 
 if ENABLE_JIT
-libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES += $(lightning_c_files)
+libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES += $(lightening_c_files)
 endif
 
 DOT_X_FILES =					\
@@ -728,7 +728,7 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads				\
     c-tokenize.lex							\
     scmconfig.h.top libgettext.h unidata_to_charset.pl libguile.map	\
     vm-operations.h libguile-2.2-gdb.scm				\
-    $(lightning_c_files) $(lightning_extra_files)
+    $(lightening_c_files) $(lightening_extra_files)
 #    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
 #    guile-procedures.txt guile.texi
 
diff --git a/libguile/jit.c b/libguile/jit.c
index e4a6699f2..ad9dc5fc0 100644
--- a/libguile/jit.c
+++ b/libguile/jit.c
@@ -1,4 +1,4 @@
-/* Copyright 2018
+/* Copyright 2018, 2019
      Free Software Foundation, Inc.
 
    This file is part of Guile.
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <sys/mman.h>
 
-#include <lightning.h>
+#include <lightening.h>
 
 #include "frames.h"
 #include "gsubr.h"
diff --git a/libguile/lightning/.gitignore b/libguile/lightening/.gitignore
similarity index 100%
rename from libguile/lightning/.gitignore
rename to libguile/lightening/.gitignore
diff --git a/libguile/lightning/.gitlab-ci.yml b/libguile/lightening/.gitlab-ci.yml
similarity index 100%
rename from libguile/lightning/.gitlab-ci.yml
rename to libguile/lightening/.gitlab-ci.yml
diff --git a/libguile/lightning/AUTHORS b/libguile/lightening/AUTHORS
similarity index 100%
rename from libguile/lightning/AUTHORS
rename to libguile/lightening/AUTHORS
diff --git a/libguile/lightning/COPYING b/libguile/lightening/COPYING
similarity index 100%
rename from libguile/lightning/COPYING
rename to libguile/lightening/COPYING
diff --git a/libguile/lightning/COPYING.DOC b/libguile/lightening/COPYING.DOC
similarity index 100%
rename from libguile/lightning/COPYING.DOC
rename to libguile/lightening/COPYING.DOC
diff --git a/libguile/lightning/COPYING.LESSER b/libguile/lightening/COPYING.LESSER
similarity index 100%
rename from libguile/lightning/COPYING.LESSER
rename to libguile/lightening/COPYING.LESSER
diff --git a/libguile/lightning/ChangeLog b/libguile/lightening/ChangeLog
similarity index 100%
rename from libguile/lightning/ChangeLog
rename to libguile/lightening/ChangeLog
diff --git a/libguile/lightning/ChangeLog.lightning b/libguile/lightening/ChangeLog.lightning
similarity index 100%
rename from libguile/lightning/ChangeLog.lightning
rename to libguile/lightening/ChangeLog.lightning
diff --git a/libguile/lightning/NEWS b/libguile/lightening/NEWS
similarity index 100%
rename from libguile/lightning/NEWS
rename to libguile/lightening/NEWS
diff --git a/libguile/lightning/README.md b/libguile/lightening/README.md
similarity index 100%
rename from libguile/lightning/README.md
rename to libguile/lightening/README.md
diff --git a/libguile/lightning/THANKS b/libguile/lightening/THANKS
similarity index 100%
rename from libguile/lightning/THANKS
rename to libguile/lightening/THANKS
diff --git a/libguile/lightening/lightening.am b/libguile/lightening/lightening.am
new file mode 100644
index 000000000..2f308a290
--- /dev/null
+++ b/libguile/lightening/lightening.am
@@ -0,0 +1,80 @@
+#
+# Copyright 2000, 2001, 2002, 2012-2019 Free Software Foundation, Inc.
+#
+# This file is part of Lightening.
+#
+# Lightening is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Lightening is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+
+lightening = $(top_srcdir)/libguile/lightening
+
+lightening_c_files = 					\
+	$(lightening)/lightening/lightening.c
+
+lightening_extra_files =				\
+	$(lightening)/AUTHORS				\
+	$(lightening)/ChangeLog				\
+	$(lightening)/ChangeLog.lightening		\
+	$(lightening)/COPYING				\
+	$(lightening)/COPYING.DOC			\
+	$(lightening)/COPYING.LESSER			\
+	$(lightening)/lightening.am			\
+	$(lightening)/lightening.texi			\
+	$(lightening)/NEWS				\
+	$(lightening)/README.md				\
+	$(lightening)/THANKS				\
+							\
+	$(lightening)/lightening.h			\
+							\
+	$(lightening)/lightening/endian.h		\
+							\
+	$(lightening)/lightening/arm.h			\
+	$(lightening)/lightening/mips.h			\
+	$(lightening)/lightening/ppc.h			\
+	$(lightening)/lightening/sparc.h		\
+	$(lightening)/lightening/x86.h			\
+	$(lightening)/lightening/ia64.h			\
+	$(lightening)/lightening/hppa.h			\
+	$(lightening)/lightening/aarch64.h		\
+	$(lightening)/lightening/s390.h			\
+	$(lightening)/lightening/alpha.h		\
+							\
+	$(lightening)/lightening/aarch64.c		\
+	$(lightening)/lightening/aarch64-cpu.c		\
+	$(lightening)/lightening/aarch64-fpu.c		\
+	$(lightening)/lightening/alpha.c		\
+	$(lightening)/lightening/alpha-cpu.c		\
+	$(lightening)/lightening/alpha-fpu.c		\
+	$(lightening)/lightening/arm.c			\
+	$(lightening)/lightening/arm-cpu.c		\
+	$(lightening)/lightening/arm-swf.c		\
+	$(lightening)/lightening/arm-vfp.c		\
+	$(lightening)/lightening/hppa.c			\
+	$(lightening)/lightening/hppa-cpu.c		\
+	$(lightening)/lightening/hppa-fpu.c		\
+	$(lightening)/lightening/ia64.c			\
+	$(lightening)/lightening/ia64-cpu.c		\
+	$(lightening)/lightening/ia64-fpu.c		\
+	$(lightening)/lightening/mips.c			\
+	$(lightening)/lightening/mips-cpu.c		\
+	$(lightening)/lightening/mips-fpu.c		\
+	$(lightening)/lightening/ppc.c			\
+	$(lightening)/lightening/ppc-cpu.c		\
+	$(lightening)/lightening/ppc-fpu.c		\
+	$(lightening)/lightening/s390.c			\
+	$(lightening)/lightening/s390-cpu.c		\
+	$(lightening)/lightening/s390-fpu.c		\
+	$(lightening)/lightening/sparc.c		\
+	$(lightening)/lightening/sparc-cpu.c		\
+	$(lightening)/lightening/sparc-fpu.c		\
+	$(lightening)/lightening/x86.c			\
+	$(lightening)/lightening/x86-cpu.c		\
+	$(lightening)/lightening/x86-sse.c
diff --git a/libguile/lightning/lightening.h b/libguile/lightening/lightening.h
similarity index 100%
rename from libguile/lightning/lightening.h
rename to libguile/lightening/lightening.h
diff --git a/libguile/lightning/lightening/aarch64-cpu.c b/libguile/lightening/lightening/aarch64-cpu.c
similarity index 100%
rename from libguile/lightning/lightening/aarch64-cpu.c
rename to libguile/lightening/lightening/aarch64-cpu.c
diff --git a/libguile/lightning/lightening/aarch64-fpu.c b/libguile/lightening/lightening/aarch64-fpu.c
similarity index 100%
rename from libguile/lightning/lightening/aarch64-fpu.c
rename to libguile/lightening/lightening/aarch64-fpu.c
diff --git a/libguile/lightning/lightening/aarch64.c b/libguile/lightening/lightening/aarch64.c
similarity index 100%
rename from libguile/lightning/lightening/aarch64.c
rename to libguile/lightening/lightening/aarch64.c
diff --git a/libguile/lightning/lightening/aarch64.h b/libguile/lightening/lightening/aarch64.h
similarity index 100%
rename from libguile/lightning/lightening/aarch64.h
rename to libguile/lightening/lightening/aarch64.h
diff --git a/libguile/lightning/lightening/alpha-cpu.c b/libguile/lightening/lightening/alpha-cpu.c
similarity index 100%
rename from libguile/lightning/lightening/alpha-cpu.c
rename to libguile/lightening/lightening/alpha-cpu.c
diff --git a/libguile/lightning/lightening/alpha-fpu.c b/libguile/lightening/lightening/alpha-fpu.c
similarity index 100%
rename from libguile/lightning/lightening/alpha-fpu.c
rename to libguile/lightening/lightening/alpha-fpu.c
diff --git a/libguile/lightning/lightening/alpha.c b/libguile/lightening/lightening/alpha.c
similarity index 100%
rename from libguile/lightning/lightening/alpha.c
rename to libguile/lightening/lightening/alpha.c
diff --git a/libguile/lightning/lightening/alpha.h b/libguile/lightening/lightening/alpha.h
similarity index 100%
rename from libguile/lightning/lightening/alpha.h
rename to libguile/lightening/lightening/alpha.h
diff --git a/libguile/lightning/lightening/arm-cpu.c b/libguile/lightening/lightening/arm-cpu.c
similarity index 100%
rename from libguile/lightning/lightening/arm-cpu.c
rename to libguile/lightening/lightening/arm-cpu.c
diff --git a/libguile/lightning/lightening/arm-swf.c b/libguile/lightening/lightening/arm-swf.c
similarity index 100%
rename from libguile/lightning/lightening/arm-swf.c
rename to libguile/lightening/lightening/arm-swf.c
diff --git a/libguile/lightning/lightening/arm-vfp.c b/libguile/lightening/lightening/arm-vfp.c
similarity index 100%
rename from libguile/lightning/lightening/arm-vfp.c
rename to libguile/lightening/lightening/arm-vfp.c
diff --git a/libguile/lightning/lightening/arm.c b/libguile/lightening/lightening/arm.c
similarity index 100%
rename from libguile/lightning/lightening/arm.c
rename to libguile/lightening/lightening/arm.c
diff --git a/libguile/lightning/lightening/arm.h b/libguile/lightening/lightening/arm.h
similarity index 100%
rename from libguile/lightning/lightening/arm.h
rename to libguile/lightening/lightening/arm.h
diff --git a/libguile/lightning/lightening/endian.h b/libguile/lightening/lightening/endian.h
similarity index 100%
rename from libguile/lightning/lightening/endian.h
rename to libguile/lightening/lightening/endian.h
diff --git a/libguile/lightning/lightening/hppa-cpu.c b/libguile/lightening/lightening/hppa-cpu.c
similarity index 100%
rename from libguile/lightning/lightening/hppa-cpu.c
rename to libguile/lightening/lightening/hppa-cpu.c
diff --git a/libguile/lightning/lightening/hppa-fpu.c b/libguile/lightening/lightening/hppa-fpu.c
similarity index 100%
rename from libguile/lightning/lightening/hppa-fpu.c
rename to libguile/lightening/lightening/hppa-fpu.c
diff --git a/libguile/lightning/lightening/hppa.c b/libguile/lightening/lightening/hppa.c
similarity index 100%
rename from libguile/lightning/lightening/hppa.c
rename to libguile/lightening/lightening/hppa.c
diff --git a/libguile/lightning/lightening/hppa.h b/libguile/lightening/lightening/hppa.h
similarity index 100%
rename from libguile/lightning/lightening/hppa.h
rename to libguile/lightening/lightening/hppa.h
diff --git a/libguile/lightning/lightening/ia64-cpu.c b/libguile/lightening/lightening/ia64-cpu.c
similarity index 100%
rename from libguile/lightning/lightening/ia64-cpu.c
rename to libguile/lightening/lightening/ia64-cpu.c
diff --git a/libguile/lightning/lightening/ia64-fpu.c b/libguile/lightening/lightening/ia64-fpu.c
similarity index 100%
rename from libguile/lightning/lightening/ia64-fpu.c
rename to libguile/lightening/lightening/ia64-fpu.c
diff --git a/libguile/lightning/lightening/ia64.c b/libguile/lightening/lightening/ia64.c
similarity index 100%
rename from libguile/lightning/lightening/ia64.c
rename to libguile/lightening/lightening/ia64.c
diff --git a/libguile/lightning/lightening/ia64.h b/libguile/lightening/lightening/ia64.h
similarity index 100%
rename from libguile/lightning/lightening/ia64.h
rename to libguile/lightening/lightening/ia64.h
diff --git a/libguile/lightning/lightening/lightening.c b/libguile/lightening/lightening/lightening.c
similarity index 100%
rename from libguile/lightning/lightening/lightening.c
rename to libguile/lightening/lightening/lightening.c
diff --git a/libguile/lightning/lightening/mips-cpu.c b/libguile/lightening/lightening/mips-cpu.c
similarity index 100%
rename from libguile/lightning/lightening/mips-cpu.c
rename to libguile/lightening/lightening/mips-cpu.c
diff --git a/libguile/lightning/lightening/mips-fpu.c b/libguile/lightening/lightening/mips-fpu.c
similarity index 100%
rename from libguile/lightning/lightening/mips-fpu.c
rename to libguile/lightening/lightening/mips-fpu.c
diff --git a/libguile/lightning/lightening/mips.c b/libguile/lightening/lightening/mips.c
similarity index 100%
rename from libguile/lightning/lightening/mips.c
rename to libguile/lightening/lightening/mips.c
diff --git a/libguile/lightning/lightening/mips.h b/libguile/lightening/lightening/mips.h
similarity index 100%
rename from libguile/lightning/lightening/mips.h
rename to libguile/lightening/lightening/mips.h
diff --git a/libguile/lightning/lightening/ppc-cpu.c b/libguile/lightening/lightening/ppc-cpu.c
similarity index 100%
rename from libguile/lightning/lightening/ppc-cpu.c
rename to libguile/lightening/lightening/ppc-cpu.c
diff --git a/libguile/lightning/lightening/ppc-fpu.c b/libguile/lightening/lightening/ppc-fpu.c
similarity index 100%
rename from libguile/lightning/lightening/ppc-fpu.c
rename to libguile/lightening/lightening/ppc-fpu.c
diff --git a/libguile/lightning/lightening/ppc.c b/libguile/lightening/lightening/ppc.c
similarity index 100%
rename from libguile/lightning/lightening/ppc.c
rename to libguile/lightening/lightening/ppc.c
diff --git a/libguile/lightning/lightening/ppc.h b/libguile/lightening/lightening/ppc.h
similarity index 100%
rename from libguile/lightning/lightening/ppc.h
rename to libguile/lightening/lightening/ppc.h
diff --git a/libguile/lightning/lightening/s390-cpu.c b/libguile/lightening/lightening/s390-cpu.c
similarity index 100%
rename from libguile/lightning/lightening/s390-cpu.c
rename to libguile/lightening/lightening/s390-cpu.c
diff --git a/libguile/lightning/lightening/s390-fpu.c b/libguile/lightening/lightening/s390-fpu.c
similarity index 100%
rename from libguile/lightning/lightening/s390-fpu.c
rename to libguile/lightening/lightening/s390-fpu.c
diff --git a/libguile/lightning/lightening/s390.c b/libguile/lightening/lightening/s390.c
similarity index 100%
rename from libguile/lightning/lightening/s390.c
rename to libguile/lightening/lightening/s390.c
diff --git a/libguile/lightning/lightening/s390.h b/libguile/lightening/lightening/s390.h
similarity index 100%
rename from libguile/lightning/lightening/s390.h
rename to libguile/lightening/lightening/s390.h
diff --git a/libguile/lightning/lightening/sparc-cpu.c b/libguile/lightening/lightening/sparc-cpu.c
similarity index 100%
rename from libguile/lightning/lightening/sparc-cpu.c
rename to libguile/lightening/lightening/sparc-cpu.c
diff --git a/libguile/lightning/lightening/sparc-fpu.c b/libguile/lightening/lightening/sparc-fpu.c
similarity index 100%
rename from libguile/lightning/lightening/sparc-fpu.c
rename to libguile/lightening/lightening/sparc-fpu.c
diff --git a/libguile/lightning/lightening/sparc.c b/libguile/lightening/lightening/sparc.c
similarity index 100%
rename from libguile/lightning/lightening/sparc.c
rename to libguile/lightening/lightening/sparc.c
diff --git a/libguile/lightning/lightening/sparc.h b/libguile/lightening/lightening/sparc.h
similarity index 100%
rename from libguile/lightning/lightening/sparc.h
rename to libguile/lightening/lightening/sparc.h
diff --git a/libguile/lightning/lightening/x86-cpu.c b/libguile/lightening/lightening/x86-cpu.c
similarity index 100%
rename from libguile/lightning/lightening/x86-cpu.c
rename to libguile/lightening/lightening/x86-cpu.c
diff --git a/libguile/lightning/lightening/x86-sse.c b/libguile/lightening/lightening/x86-sse.c
similarity index 100%
rename from libguile/lightning/lightening/x86-sse.c
rename to libguile/lightening/lightening/x86-sse.c
diff --git a/libguile/lightning/lightening/x86-x87.c b/libguile/lightening/lightening/x86-x87.c
similarity index 100%
rename from libguile/lightning/lightening/x86-x87.c
rename to libguile/lightening/lightening/x86-x87.c
diff --git a/libguile/lightning/lightening/x86.c b/libguile/lightening/lightening/x86.c
similarity index 100%
rename from libguile/lightning/lightening/x86.c
rename to libguile/lightening/lightening/x86.c
diff --git a/libguile/lightning/lightening/x86.h b/libguile/lightening/lightening/x86.h
similarity index 100%
rename from libguile/lightning/lightening/x86.h
rename to libguile/lightening/lightening/x86.h
diff --git a/libguile/lightning/lightning.texi b/libguile/lightening/lightning.texi
similarity index 100%
rename from libguile/lightning/lightning.texi
rename to libguile/lightening/lightning.texi
diff --git a/libguile/lightning/tests/Makefile b/libguile/lightening/tests/Makefile
similarity index 100%
rename from libguile/lightning/tests/Makefile
rename to libguile/lightening/tests/Makefile
diff --git a/libguile/lightning/tests/absr_d.c b/libguile/lightening/tests/absr_d.c
similarity index 100%
rename from libguile/lightning/tests/absr_d.c
rename to libguile/lightening/tests/absr_d.c
diff --git a/libguile/lightning/tests/absr_f.c b/libguile/lightening/tests/absr_f.c
similarity index 100%
rename from libguile/lightning/tests/absr_f.c
rename to libguile/lightening/tests/absr_f.c
diff --git a/libguile/lightning/tests/addi.c b/libguile/lightening/tests/addi.c
similarity index 100%
rename from libguile/lightning/tests/addi.c
rename to libguile/lightening/tests/addi.c
diff --git a/libguile/lightning/tests/addr.c b/libguile/lightening/tests/addr.c
similarity index 100%
rename from libguile/lightning/tests/addr.c
rename to libguile/lightening/tests/addr.c
diff --git a/libguile/lightning/tests/addr_d.c b/libguile/lightening/tests/addr_d.c
similarity index 100%
rename from libguile/lightning/tests/addr_d.c
rename to libguile/lightening/tests/addr_d.c
diff --git a/libguile/lightning/tests/addr_f.c b/libguile/lightening/tests/addr_f.c
similarity index 100%
rename from libguile/lightning/tests/addr_f.c
rename to libguile/lightening/tests/addr_f.c
diff --git a/libguile/lightning/tests/addx.c b/libguile/lightening/tests/addx.c
similarity index 100%
rename from libguile/lightning/tests/addx.c
rename to libguile/lightening/tests/addx.c
diff --git a/libguile/lightning/tests/andi.c b/libguile/lightening/tests/andi.c
similarity index 100%
rename from libguile/lightning/tests/andi.c
rename to libguile/lightening/tests/andi.c
diff --git a/libguile/lightning/tests/andr.c b/libguile/lightening/tests/andr.c
similarity index 100%
rename from libguile/lightning/tests/andr.c
rename to libguile/lightening/tests/andr.c
diff --git a/libguile/lightning/tests/beqi.c b/libguile/lightening/tests/beqi.c
similarity index 100%
rename from libguile/lightning/tests/beqi.c
rename to libguile/lightening/tests/beqi.c
diff --git a/libguile/lightning/tests/beqr.c b/libguile/lightening/tests/beqr.c
similarity index 100%
rename from libguile/lightning/tests/beqr.c
rename to libguile/lightening/tests/beqr.c
diff --git a/libguile/lightning/tests/beqr_d.c b/libguile/lightening/tests/beqr_d.c
similarity index 100%
rename from libguile/lightning/tests/beqr_d.c
rename to libguile/lightening/tests/beqr_d.c
diff --git a/libguile/lightning/tests/beqr_f.c b/libguile/lightening/tests/beqr_f.c
similarity index 100%
rename from libguile/lightning/tests/beqr_f.c
rename to libguile/lightening/tests/beqr_f.c
diff --git a/libguile/lightning/tests/bgei.c b/libguile/lightening/tests/bgei.c
similarity index 100%
rename from libguile/lightning/tests/bgei.c
rename to libguile/lightening/tests/bgei.c
diff --git a/libguile/lightning/tests/bgei_u.c b/libguile/lightening/tests/bgei_u.c
similarity index 100%
rename from libguile/lightning/tests/bgei_u.c
rename to libguile/lightening/tests/bgei_u.c
diff --git a/libguile/lightning/tests/bger.c b/libguile/lightening/tests/bger.c
similarity index 100%
rename from libguile/lightning/tests/bger.c
rename to libguile/lightening/tests/bger.c
diff --git a/libguile/lightning/tests/bger_d.c b/libguile/lightening/tests/bger_d.c
similarity index 100%
rename from libguile/lightning/tests/bger_d.c
rename to libguile/lightening/tests/bger_d.c
diff --git a/libguile/lightning/tests/bger_f.c b/libguile/lightening/tests/bger_f.c
similarity index 100%
rename from libguile/lightning/tests/bger_f.c
rename to libguile/lightening/tests/bger_f.c
diff --git a/libguile/lightning/tests/bger_u.c b/libguile/lightening/tests/bger_u.c
similarity index 100%
rename from libguile/lightning/tests/bger_u.c
rename to libguile/lightening/tests/bger_u.c
diff --git a/libguile/lightning/tests/bgti.c b/libguile/lightening/tests/bgti.c
similarity index 100%
rename from libguile/lightning/tests/bgti.c
rename to libguile/lightening/tests/bgti.c
diff --git a/libguile/lightning/tests/bgti_u.c b/libguile/lightening/tests/bgti_u.c
similarity index 100%
rename from libguile/lightning/tests/bgti_u.c
rename to libguile/lightening/tests/bgti_u.c
diff --git a/libguile/lightning/tests/bgtr.c b/libguile/lightening/tests/bgtr.c
similarity index 100%
rename from libguile/lightning/tests/bgtr.c
rename to libguile/lightening/tests/bgtr.c
diff --git a/libguile/lightning/tests/bgtr_d.c b/libguile/lightening/tests/bgtr_d.c
similarity index 100%
rename from libguile/lightning/tests/bgtr_d.c
rename to libguile/lightening/tests/bgtr_d.c
diff --git a/libguile/lightning/tests/bgtr_f.c b/libguile/lightening/tests/bgtr_f.c
similarity index 100%
rename from libguile/lightning/tests/bgtr_f.c
rename to libguile/lightening/tests/bgtr_f.c
diff --git a/libguile/lightning/tests/bgtr_u.c b/libguile/lightening/tests/bgtr_u.c
similarity index 100%
rename from libguile/lightning/tests/bgtr_u.c
rename to libguile/lightening/tests/bgtr_u.c
diff --git a/libguile/lightning/tests/blei.c b/libguile/lightening/tests/blei.c
similarity index 100%
rename from libguile/lightning/tests/blei.c
rename to libguile/lightening/tests/blei.c
diff --git a/libguile/lightning/tests/blei_u.c b/libguile/lightening/tests/blei_u.c
similarity index 100%
rename from libguile/lightning/tests/blei_u.c
rename to libguile/lightening/tests/blei_u.c
diff --git a/libguile/lightning/tests/bler.c b/libguile/lightening/tests/bler.c
similarity index 100%
rename from libguile/lightning/tests/bler.c
rename to libguile/lightening/tests/bler.c
diff --git a/libguile/lightning/tests/bler_d.c b/libguile/lightening/tests/bler_d.c
similarity index 100%
rename from libguile/lightning/tests/bler_d.c
rename to libguile/lightening/tests/bler_d.c
diff --git a/libguile/lightning/tests/bler_f.c b/libguile/lightening/tests/bler_f.c
similarity index 100%
rename from libguile/lightning/tests/bler_f.c
rename to libguile/lightening/tests/bler_f.c
diff --git a/libguile/lightning/tests/bler_u.c b/libguile/lightening/tests/bler_u.c
similarity index 100%
rename from libguile/lightning/tests/bler_u.c
rename to libguile/lightening/tests/bler_u.c
diff --git a/libguile/lightning/tests/bltgtr_d.c b/libguile/lightening/tests/bltgtr_d.c
similarity index 100%
rename from libguile/lightning/tests/bltgtr_d.c
rename to libguile/lightening/tests/bltgtr_d.c
diff --git a/libguile/lightning/tests/bltgtr_f.c b/libguile/lightening/tests/bltgtr_f.c
similarity index 100%
rename from libguile/lightning/tests/bltgtr_f.c
rename to libguile/lightening/tests/bltgtr_f.c
diff --git a/libguile/lightning/tests/blti.c b/libguile/lightening/tests/blti.c
similarity index 100%
rename from libguile/lightning/tests/blti.c
rename to libguile/lightening/tests/blti.c
diff --git a/libguile/lightning/tests/blti_u.c b/libguile/lightening/tests/blti_u.c
similarity index 100%
rename from libguile/lightning/tests/blti_u.c
rename to libguile/lightening/tests/blti_u.c
diff --git a/libguile/lightning/tests/bltr.c b/libguile/lightening/tests/bltr.c
similarity index 100%
rename from libguile/lightning/tests/bltr.c
rename to libguile/lightening/tests/bltr.c
diff --git a/libguile/lightning/tests/bltr_d.c b/libguile/lightening/tests/bltr_d.c
similarity index 100%
rename from libguile/lightning/tests/bltr_d.c
rename to libguile/lightening/tests/bltr_d.c
diff --git a/libguile/lightning/tests/bltr_f.c b/libguile/lightening/tests/bltr_f.c
similarity index 100%
rename from libguile/lightning/tests/bltr_f.c
rename to libguile/lightening/tests/bltr_f.c
diff --git a/libguile/lightning/tests/bltr_u.c b/libguile/lightening/tests/bltr_u.c
similarity index 100%
rename from libguile/lightning/tests/bltr_u.c
rename to libguile/lightening/tests/bltr_u.c
diff --git a/libguile/lightning/tests/bmci.c b/libguile/lightening/tests/bmci.c
similarity index 100%
rename from libguile/lightning/tests/bmci.c
rename to libguile/lightening/tests/bmci.c
diff --git a/libguile/lightning/tests/bmcr.c b/libguile/lightening/tests/bmcr.c
similarity index 100%
rename from libguile/lightning/tests/bmcr.c
rename to libguile/lightening/tests/bmcr.c
diff --git a/libguile/lightning/tests/bmsi.c b/libguile/lightening/tests/bmsi.c
similarity index 100%
rename from libguile/lightning/tests/bmsi.c
rename to libguile/lightening/tests/bmsi.c
diff --git a/libguile/lightning/tests/bmsr.c b/libguile/lightening/tests/bmsr.c
similarity index 100%
rename from libguile/lightning/tests/bmsr.c
rename to libguile/lightening/tests/bmsr.c
diff --git a/libguile/lightning/tests/bnei.c b/libguile/lightening/tests/bnei.c
similarity index 100%
rename from libguile/lightning/tests/bnei.c
rename to libguile/lightening/tests/bnei.c
diff --git a/libguile/lightning/tests/bner.c b/libguile/lightening/tests/bner.c
similarity index 100%
rename from libguile/lightning/tests/bner.c
rename to libguile/lightening/tests/bner.c
diff --git a/libguile/lightning/tests/bner_d.c b/libguile/lightening/tests/bner_d.c
similarity index 100%
rename from libguile/lightning/tests/bner_d.c
rename to libguile/lightening/tests/bner_d.c
diff --git a/libguile/lightning/tests/bner_f.c b/libguile/lightening/tests/bner_f.c
similarity index 100%
rename from libguile/lightning/tests/bner_f.c
rename to libguile/lightening/tests/bner_f.c
diff --git a/libguile/lightning/tests/boaddi.c b/libguile/lightening/tests/boaddi.c
similarity index 100%
rename from libguile/lightning/tests/boaddi.c
rename to libguile/lightening/tests/boaddi.c
diff --git a/libguile/lightning/tests/boaddi_u.c b/libguile/lightening/tests/boaddi_u.c
similarity index 100%
rename from libguile/lightning/tests/boaddi_u.c
rename to libguile/lightening/tests/boaddi_u.c
diff --git a/libguile/lightning/tests/boaddr.c b/libguile/lightening/tests/boaddr.c
similarity index 100%
rename from libguile/lightning/tests/boaddr.c
rename to libguile/lightening/tests/boaddr.c
diff --git a/libguile/lightning/tests/boaddr_u.c b/libguile/lightening/tests/boaddr_u.c
similarity index 100%
rename from libguile/lightning/tests/boaddr_u.c
rename to libguile/lightening/tests/boaddr_u.c
diff --git a/libguile/lightning/tests/bordr_d.c b/libguile/lightening/tests/bordr_d.c
similarity index 100%
rename from libguile/lightning/tests/bordr_d.c
rename to libguile/lightening/tests/bordr_d.c
diff --git a/libguile/lightning/tests/bordr_f.c b/libguile/lightening/tests/bordr_f.c
similarity index 100%
rename from libguile/lightning/tests/bordr_f.c
rename to libguile/lightening/tests/bordr_f.c
diff --git a/libguile/lightning/tests/bosubi.c b/libguile/lightening/tests/bosubi.c
similarity index 100%
rename from libguile/lightning/tests/bosubi.c
rename to libguile/lightening/tests/bosubi.c
diff --git a/libguile/lightning/tests/bosubi_u.c b/libguile/lightening/tests/bosubi_u.c
similarity index 100%
rename from libguile/lightning/tests/bosubi_u.c
rename to libguile/lightening/tests/bosubi_u.c
diff --git a/libguile/lightning/tests/bosubr.c b/libguile/lightening/tests/bosubr.c
similarity index 100%
rename from libguile/lightning/tests/bosubr.c
rename to libguile/lightening/tests/bosubr.c
diff --git a/libguile/lightning/tests/bosubr_u.c b/libguile/lightening/tests/bosubr_u.c
similarity index 100%
rename from libguile/lightning/tests/bosubr_u.c
rename to libguile/lightening/tests/bosubr_u.c
diff --git a/libguile/lightning/tests/bswapr_ui.c b/libguile/lightening/tests/bswapr_ui.c
similarity index 100%
rename from libguile/lightning/tests/bswapr_ui.c
rename to libguile/lightening/tests/bswapr_ui.c
diff --git a/libguile/lightning/tests/bswapr_ul.c b/libguile/lightening/tests/bswapr_ul.c
similarity index 100%
rename from libguile/lightning/tests/bswapr_ul.c
rename to libguile/lightening/tests/bswapr_ul.c
diff --git a/libguile/lightning/tests/bswapr_us.c b/libguile/lightening/tests/bswapr_us.c
similarity index 100%
rename from libguile/lightning/tests/bswapr_us.c
rename to libguile/lightening/tests/bswapr_us.c
diff --git a/libguile/lightning/tests/buneqr_d.c b/libguile/lightening/tests/buneqr_d.c
similarity index 100%
rename from libguile/lightning/tests/buneqr_d.c
rename to libguile/lightening/tests/buneqr_d.c
diff --git a/libguile/lightning/tests/buneqr_f.c b/libguile/lightening/tests/buneqr_f.c
similarity index 100%
rename from libguile/lightning/tests/buneqr_f.c
rename to libguile/lightening/tests/buneqr_f.c
diff --git a/libguile/lightning/tests/bunger_d.c b/libguile/lightening/tests/bunger_d.c
similarity index 100%
rename from libguile/lightning/tests/bunger_d.c
rename to libguile/lightening/tests/bunger_d.c
diff --git a/libguile/lightning/tests/bunger_f.c b/libguile/lightening/tests/bunger_f.c
similarity index 100%
rename from libguile/lightning/tests/bunger_f.c
rename to libguile/lightening/tests/bunger_f.c
diff --git a/libguile/lightning/tests/bungtr_d.c b/libguile/lightening/tests/bungtr_d.c
similarity index 100%
rename from libguile/lightning/tests/bungtr_d.c
rename to libguile/lightening/tests/bungtr_d.c
diff --git a/libguile/lightning/tests/bungtr_f.c b/libguile/lightening/tests/bungtr_f.c
similarity index 100%
rename from libguile/lightning/tests/bungtr_f.c
rename to libguile/lightening/tests/bungtr_f.c
diff --git a/libguile/lightning/tests/bunler_d.c b/libguile/lightening/tests/bunler_d.c
similarity index 100%
rename from libguile/lightning/tests/bunler_d.c
rename to libguile/lightening/tests/bunler_d.c
diff --git a/libguile/lightning/tests/bunler_f.c b/libguile/lightening/tests/bunler_f.c
similarity index 100%
rename from libguile/lightning/tests/bunler_f.c
rename to libguile/lightening/tests/bunler_f.c
diff --git a/libguile/lightning/tests/bunltr_d.c b/libguile/lightening/tests/bunltr_d.c
similarity index 100%
rename from libguile/lightning/tests/bunltr_d.c
rename to libguile/lightening/tests/bunltr_d.c
diff --git a/libguile/lightning/tests/bunltr_f.c b/libguile/lightening/tests/bunltr_f.c
similarity index 100%
rename from libguile/lightning/tests/bunltr_f.c
rename to libguile/lightening/tests/bunltr_f.c
diff --git a/libguile/lightning/tests/bunordr_d.c b/libguile/lightening/tests/bunordr_d.c
similarity index 100%
rename from libguile/lightning/tests/bunordr_d.c
rename to libguile/lightening/tests/bunordr_d.c
diff --git a/libguile/lightning/tests/bunordr_f.c b/libguile/lightening/tests/bunordr_f.c
similarity index 100%
rename from libguile/lightning/tests/bunordr_f.c
rename to libguile/lightening/tests/bunordr_f.c
diff --git a/libguile/lightning/tests/bxaddi.c b/libguile/lightening/tests/bxaddi.c
similarity index 100%
rename from libguile/lightning/tests/bxaddi.c
rename to libguile/lightening/tests/bxaddi.c
diff --git a/libguile/lightning/tests/bxaddi_u.c b/libguile/lightening/tests/bxaddi_u.c
similarity index 100%
rename from libguile/lightning/tests/bxaddi_u.c
rename to libguile/lightening/tests/bxaddi_u.c
diff --git a/libguile/lightning/tests/bxaddr.c b/libguile/lightening/tests/bxaddr.c
similarity index 100%
rename from libguile/lightning/tests/bxaddr.c
rename to libguile/lightening/tests/bxaddr.c
diff --git a/libguile/lightning/tests/bxaddr_u.c b/libguile/lightening/tests/bxaddr_u.c
similarity index 100%
rename from libguile/lightning/tests/bxaddr_u.c
rename to libguile/lightening/tests/bxaddr_u.c
diff --git a/libguile/lightning/tests/bxsubi.c b/libguile/lightening/tests/bxsubi.c
similarity index 100%
rename from libguile/lightning/tests/bxsubi.c
rename to libguile/lightening/tests/bxsubi.c
diff --git a/libguile/lightning/tests/bxsubi_u.c b/libguile/lightening/tests/bxsubi_u.c
similarity index 100%
rename from libguile/lightning/tests/bxsubi_u.c
rename to libguile/lightening/tests/bxsubi_u.c
diff --git a/libguile/lightning/tests/bxsubr.c b/libguile/lightening/tests/bxsubr.c
similarity index 100%
rename from libguile/lightning/tests/bxsubr.c
rename to libguile/lightening/tests/bxsubr.c
diff --git a/libguile/lightning/tests/bxsubr_u.c b/libguile/lightening/tests/bxsubr_u.c
similarity index 100%
rename from libguile/lightning/tests/bxsubr_u.c
rename to libguile/lightening/tests/bxsubr_u.c
diff --git a/libguile/lightning/tests/comr.c b/libguile/lightening/tests/comr.c
similarity index 100%
rename from libguile/lightning/tests/comr.c
rename to libguile/lightening/tests/comr.c
diff --git a/libguile/lightning/tests/divr.c b/libguile/lightening/tests/divr.c
similarity index 100%
rename from libguile/lightning/tests/divr.c
rename to libguile/lightening/tests/divr.c
diff --git a/libguile/lightning/tests/divr_d.c b/libguile/lightening/tests/divr_d.c
similarity index 100%
rename from libguile/lightning/tests/divr_d.c
rename to libguile/lightening/tests/divr_d.c
diff --git a/libguile/lightning/tests/divr_f.c b/libguile/lightening/tests/divr_f.c
similarity index 100%
rename from libguile/lightning/tests/divr_f.c
rename to libguile/lightening/tests/divr_f.c
diff --git a/libguile/lightning/tests/divr_u.c b/libguile/lightening/tests/divr_u.c
similarity index 100%
rename from libguile/lightning/tests/divr_u.c
rename to libguile/lightening/tests/divr_u.c
diff --git a/libguile/lightning/tests/extr_c.c b/libguile/lightening/tests/extr_c.c
similarity index 100%
rename from libguile/lightning/tests/extr_c.c
rename to libguile/lightening/tests/extr_c.c
diff --git a/libguile/lightning/tests/extr_d.c b/libguile/lightening/tests/extr_d.c
similarity index 100%
rename from libguile/lightning/tests/extr_d.c
rename to libguile/lightening/tests/extr_d.c
diff --git a/libguile/lightning/tests/extr_d_f.c b/libguile/lightening/tests/extr_d_f.c
similarity index 100%
rename from libguile/lightning/tests/extr_d_f.c
rename to libguile/lightening/tests/extr_d_f.c
diff --git a/libguile/lightning/tests/extr_f.c b/libguile/lightening/tests/extr_f.c
similarity index 100%
rename from libguile/lightning/tests/extr_f.c
rename to libguile/lightening/tests/extr_f.c
diff --git a/libguile/lightning/tests/extr_f_d.c b/libguile/lightening/tests/extr_f_d.c
similarity index 100%
rename from libguile/lightning/tests/extr_f_d.c
rename to libguile/lightening/tests/extr_f_d.c
diff --git a/libguile/lightning/tests/extr_i.c b/libguile/lightening/tests/extr_i.c
similarity index 100%
rename from libguile/lightning/tests/extr_i.c
rename to libguile/lightening/tests/extr_i.c
diff --git a/libguile/lightning/tests/extr_s.c b/libguile/lightening/tests/extr_s.c
similarity index 100%
rename from libguile/lightning/tests/extr_s.c
rename to libguile/lightening/tests/extr_s.c
diff --git a/libguile/lightning/tests/extr_uc.c b/libguile/lightening/tests/extr_uc.c
similarity index 100%
rename from libguile/lightning/tests/extr_uc.c
rename to libguile/lightening/tests/extr_uc.c
diff --git a/libguile/lightning/tests/extr_ui.c b/libguile/lightening/tests/extr_ui.c
similarity index 100%
rename from libguile/lightning/tests/extr_ui.c
rename to libguile/lightening/tests/extr_ui.c
diff --git a/libguile/lightning/tests/extr_us.c b/libguile/lightening/tests/extr_us.c
similarity index 100%
rename from libguile/lightning/tests/extr_us.c
rename to libguile/lightening/tests/extr_us.c
diff --git a/libguile/lightning/tests/jmpi.c b/libguile/lightening/tests/jmpi.c
similarity index 100%
rename from libguile/lightning/tests/jmpi.c
rename to libguile/lightening/tests/jmpi.c
diff --git a/libguile/lightning/tests/jmpr.c b/libguile/lightening/tests/jmpr.c
similarity index 100%
rename from libguile/lightning/tests/jmpr.c
rename to libguile/lightening/tests/jmpr.c
diff --git a/libguile/lightning/tests/ldi_c.c b/libguile/lightening/tests/ldi_c.c
similarity index 100%
rename from libguile/lightning/tests/ldi_c.c
rename to libguile/lightening/tests/ldi_c.c
diff --git a/libguile/lightning/tests/ldi_d.c b/libguile/lightening/tests/ldi_d.c
similarity index 100%
rename from libguile/lightning/tests/ldi_d.c
rename to libguile/lightening/tests/ldi_d.c
diff --git a/libguile/lightning/tests/ldi_f.c b/libguile/lightening/tests/ldi_f.c
similarity index 100%
rename from libguile/lightning/tests/ldi_f.c
rename to libguile/lightening/tests/ldi_f.c
diff --git a/libguile/lightning/tests/ldi_i.c b/libguile/lightening/tests/ldi_i.c
similarity index 100%
rename from libguile/lightning/tests/ldi_i.c
rename to libguile/lightening/tests/ldi_i.c
diff --git a/libguile/lightning/tests/ldi_l.c b/libguile/lightening/tests/ldi_l.c
similarity index 100%
rename from libguile/lightning/tests/ldi_l.c
rename to libguile/lightening/tests/ldi_l.c
diff --git a/libguile/lightning/tests/ldi_s.c b/libguile/lightening/tests/ldi_s.c
similarity index 100%
rename from libguile/lightning/tests/ldi_s.c
rename to libguile/lightening/tests/ldi_s.c
diff --git a/libguile/lightning/tests/ldi_uc.c b/libguile/lightening/tests/ldi_uc.c
similarity index 100%
rename from libguile/lightning/tests/ldi_uc.c
rename to libguile/lightening/tests/ldi_uc.c
diff --git a/libguile/lightning/tests/ldi_ui.c b/libguile/lightening/tests/ldi_ui.c
similarity index 100%
rename from libguile/lightning/tests/ldi_ui.c
rename to libguile/lightening/tests/ldi_ui.c
diff --git a/libguile/lightning/tests/ldi_us.c b/libguile/lightening/tests/ldi_us.c
similarity index 100%
rename from libguile/lightning/tests/ldi_us.c
rename to libguile/lightening/tests/ldi_us.c
diff --git a/libguile/lightning/tests/ldr_c.c b/libguile/lightening/tests/ldr_c.c
similarity index 100%
rename from libguile/lightning/tests/ldr_c.c
rename to libguile/lightening/tests/ldr_c.c
diff --git a/libguile/lightning/tests/ldr_d.c b/libguile/lightening/tests/ldr_d.c
similarity index 100%
rename from libguile/lightning/tests/ldr_d.c
rename to libguile/lightening/tests/ldr_d.c
diff --git a/libguile/lightning/tests/ldr_f.c b/libguile/lightening/tests/ldr_f.c
similarity index 100%
rename from libguile/lightning/tests/ldr_f.c
rename to libguile/lightening/tests/ldr_f.c
diff --git a/libguile/lightning/tests/ldr_i.c b/libguile/lightening/tests/ldr_i.c
similarity index 100%
rename from libguile/lightning/tests/ldr_i.c
rename to libguile/lightening/tests/ldr_i.c
diff --git a/libguile/lightning/tests/ldr_l.c b/libguile/lightening/tests/ldr_l.c
similarity index 100%
rename from libguile/lightning/tests/ldr_l.c
rename to libguile/lightening/tests/ldr_l.c
diff --git a/libguile/lightning/tests/ldr_s.c b/libguile/lightening/tests/ldr_s.c
similarity index 100%
rename from libguile/lightning/tests/ldr_s.c
rename to libguile/lightening/tests/ldr_s.c
diff --git a/libguile/lightning/tests/ldr_uc.c b/libguile/lightening/tests/ldr_uc.c
similarity index 100%
rename from libguile/lightning/tests/ldr_uc.c
rename to libguile/lightening/tests/ldr_uc.c
diff --git a/libguile/lightning/tests/ldr_ui.c b/libguile/lightening/tests/ldr_ui.c
similarity index 100%
rename from libguile/lightning/tests/ldr_ui.c
rename to libguile/lightening/tests/ldr_ui.c
diff --git a/libguile/lightning/tests/ldr_us.c b/libguile/lightening/tests/ldr_us.c
similarity index 100%
rename from libguile/lightning/tests/ldr_us.c
rename to libguile/lightening/tests/ldr_us.c
diff --git a/libguile/lightning/tests/ldxi_c.c b/libguile/lightening/tests/ldxi_c.c
similarity index 100%
rename from libguile/lightning/tests/ldxi_c.c
rename to libguile/lightening/tests/ldxi_c.c
diff --git a/libguile/lightning/tests/ldxi_d.c b/libguile/lightening/tests/ldxi_d.c
similarity index 100%
rename from libguile/lightning/tests/ldxi_d.c
rename to libguile/lightening/tests/ldxi_d.c
diff --git a/libguile/lightning/tests/ldxi_f.c b/libguile/lightening/tests/ldxi_f.c
similarity index 100%
rename from libguile/lightning/tests/ldxi_f.c
rename to libguile/lightening/tests/ldxi_f.c
diff --git a/libguile/lightning/tests/ldxi_i.c b/libguile/lightening/tests/ldxi_i.c
similarity index 100%
rename from libguile/lightning/tests/ldxi_i.c
rename to libguile/lightening/tests/ldxi_i.c
diff --git a/libguile/lightning/tests/ldxi_l.c b/libguile/lightening/tests/ldxi_l.c
similarity index 100%
rename from libguile/lightning/tests/ldxi_l.c
rename to libguile/lightening/tests/ldxi_l.c
diff --git a/libguile/lightning/tests/ldxi_s.c b/libguile/lightening/tests/ldxi_s.c
similarity index 100%
rename from libguile/lightning/tests/ldxi_s.c
rename to libguile/lightening/tests/ldxi_s.c
diff --git a/libguile/lightning/tests/ldxi_uc.c b/libguile/lightening/tests/ldxi_uc.c
similarity index 100%
rename from libguile/lightning/tests/ldxi_uc.c
rename to libguile/lightening/tests/ldxi_uc.c
diff --git a/libguile/lightning/tests/ldxi_ui.c b/libguile/lightening/tests/ldxi_ui.c
similarity index 100%
rename from libguile/lightning/tests/ldxi_ui.c
rename to libguile/lightening/tests/ldxi_ui.c
diff --git a/libguile/lightning/tests/ldxi_us.c b/libguile/lightening/tests/ldxi_us.c
similarity index 100%
rename from libguile/lightning/tests/ldxi_us.c
rename to libguile/lightening/tests/ldxi_us.c
diff --git a/libguile/lightning/tests/ldxr_c.c b/libguile/lightening/tests/ldxr_c.c
similarity index 100%
rename from libguile/lightning/tests/ldxr_c.c
rename to libguile/lightening/tests/ldxr_c.c
diff --git a/libguile/lightning/tests/ldxr_d.c b/libguile/lightening/tests/ldxr_d.c
similarity index 100%
rename from libguile/lightning/tests/ldxr_d.c
rename to libguile/lightening/tests/ldxr_d.c
diff --git a/libguile/lightning/tests/ldxr_f.c b/libguile/lightening/tests/ldxr_f.c
similarity index 100%
rename from libguile/lightning/tests/ldxr_f.c
rename to libguile/lightening/tests/ldxr_f.c
diff --git a/libguile/lightning/tests/ldxr_i.c b/libguile/lightening/tests/ldxr_i.c
similarity index 100%
rename from libguile/lightning/tests/ldxr_i.c
rename to libguile/lightening/tests/ldxr_i.c
diff --git a/libguile/lightning/tests/ldxr_l.c b/libguile/lightening/tests/ldxr_l.c
similarity index 100%
rename from libguile/lightning/tests/ldxr_l.c
rename to libguile/lightening/tests/ldxr_l.c
diff --git a/libguile/lightning/tests/ldxr_s.c b/libguile/lightening/tests/ldxr_s.c
similarity index 100%
rename from libguile/lightning/tests/ldxr_s.c
rename to libguile/lightening/tests/ldxr_s.c
diff --git a/libguile/lightning/tests/ldxr_uc.c b/libguile/lightening/tests/ldxr_uc.c
similarity index 100%
rename from libguile/lightning/tests/ldxr_uc.c
rename to libguile/lightening/tests/ldxr_uc.c
diff --git a/libguile/lightning/tests/ldxr_ui.c b/libguile/lightening/tests/ldxr_ui.c
similarity index 100%
rename from libguile/lightning/tests/ldxr_ui.c
rename to libguile/lightening/tests/ldxr_ui.c
diff --git a/libguile/lightning/tests/ldxr_us.c b/libguile/lightening/tests/ldxr_us.c
similarity index 100%
rename from libguile/lightning/tests/ldxr_us.c
rename to libguile/lightening/tests/ldxr_us.c
diff --git a/libguile/lightning/tests/lshi.c b/libguile/lightening/tests/lshi.c
similarity index 100%
rename from libguile/lightning/tests/lshi.c
rename to libguile/lightening/tests/lshi.c
diff --git a/libguile/lightning/tests/lshr.c b/libguile/lightening/tests/lshr.c
similarity index 100%
rename from libguile/lightning/tests/lshr.c
rename to libguile/lightening/tests/lshr.c
diff --git a/libguile/lightning/tests/mov_addr.c b/libguile/lightening/tests/mov_addr.c
similarity index 100%
rename from libguile/lightning/tests/mov_addr.c
rename to libguile/lightening/tests/mov_addr.c
diff --git a/libguile/lightning/tests/movi_d.c b/libguile/lightening/tests/movi_d.c
similarity index 100%
rename from libguile/lightning/tests/movi_d.c
rename to libguile/lightening/tests/movi_d.c
diff --git a/libguile/lightning/tests/movi_f.c b/libguile/lightening/tests/movi_f.c
similarity index 100%
rename from libguile/lightning/tests/movi_f.c
rename to libguile/lightening/tests/movi_f.c
diff --git a/libguile/lightning/tests/mulr.c b/libguile/lightening/tests/mulr.c
similarity index 100%
rename from libguile/lightning/tests/mulr.c
rename to libguile/lightening/tests/mulr.c
diff --git a/libguile/lightning/tests/mulr_d.c b/libguile/lightening/tests/mulr_d.c
similarity index 100%
rename from libguile/lightning/tests/mulr_d.c
rename to libguile/lightening/tests/mulr_d.c
diff --git a/libguile/lightning/tests/mulr_f.c b/libguile/lightening/tests/mulr_f.c
similarity index 100%
rename from libguile/lightning/tests/mulr_f.c
rename to libguile/lightening/tests/mulr_f.c
diff --git a/libguile/lightning/tests/negr.c b/libguile/lightening/tests/negr.c
similarity index 100%
rename from libguile/lightning/tests/negr.c
rename to libguile/lightening/tests/negr.c
diff --git a/libguile/lightning/tests/negr_d.c b/libguile/lightening/tests/negr_d.c
similarity index 100%
rename from libguile/lightning/tests/negr_d.c
rename to libguile/lightening/tests/negr_d.c
diff --git a/libguile/lightning/tests/negr_f.c b/libguile/lightening/tests/negr_f.c
similarity index 100%
rename from libguile/lightning/tests/negr_f.c
rename to libguile/lightening/tests/negr_f.c
diff --git a/libguile/lightning/tests/nop.c b/libguile/lightening/tests/nop.c
similarity index 100%
rename from libguile/lightning/tests/nop.c
rename to libguile/lightening/tests/nop.c
diff --git a/libguile/lightning/tests/ori.c b/libguile/lightening/tests/ori.c
similarity index 100%
rename from libguile/lightning/tests/ori.c
rename to libguile/lightening/tests/ori.c
diff --git a/libguile/lightning/tests/orr.c b/libguile/lightening/tests/orr.c
similarity index 100%
rename from libguile/lightning/tests/orr.c
rename to libguile/lightening/tests/orr.c
diff --git a/libguile/lightning/tests/pushpop.c b/libguile/lightening/tests/pushpop.c
similarity index 100%
rename from libguile/lightning/tests/pushpop.c
rename to libguile/lightening/tests/pushpop.c
diff --git a/libguile/lightning/tests/qdivr.c b/libguile/lightening/tests/qdivr.c
similarity index 100%
rename from libguile/lightning/tests/qdivr.c
rename to libguile/lightening/tests/qdivr.c
diff --git a/libguile/lightning/tests/qdivr_u.c b/libguile/lightening/tests/qdivr_u.c
similarity index 100%
rename from libguile/lightning/tests/qdivr_u.c
rename to libguile/lightening/tests/qdivr_u.c
diff --git a/libguile/lightning/tests/qmulr.c b/libguile/lightening/tests/qmulr.c
similarity index 100%
rename from libguile/lightning/tests/qmulr.c
rename to libguile/lightening/tests/qmulr.c
diff --git a/libguile/lightning/tests/qmulr_u.c b/libguile/lightening/tests/qmulr_u.c
similarity index 100%
rename from libguile/lightning/tests/qmulr_u.c
rename to libguile/lightening/tests/qmulr_u.c
diff --git a/libguile/lightning/tests/remr.c b/libguile/lightening/tests/remr.c
similarity index 100%
rename from libguile/lightning/tests/remr.c
rename to libguile/lightening/tests/remr.c
diff --git a/libguile/lightning/tests/remr_u.c b/libguile/lightening/tests/remr_u.c
similarity index 100%
rename from libguile/lightning/tests/remr_u.c
rename to libguile/lightening/tests/remr_u.c
diff --git a/libguile/lightning/tests/rshi.c b/libguile/lightening/tests/rshi.c
similarity index 100%
rename from libguile/lightning/tests/rshi.c
rename to libguile/lightening/tests/rshi.c
diff --git a/libguile/lightning/tests/rshi_u.c b/libguile/lightening/tests/rshi_u.c
similarity index 100%
rename from libguile/lightning/tests/rshi_u.c
rename to libguile/lightening/tests/rshi_u.c
diff --git a/libguile/lightning/tests/rshr.c b/libguile/lightening/tests/rshr.c
similarity index 100%
rename from libguile/lightning/tests/rshr.c
rename to libguile/lightening/tests/rshr.c
diff --git a/libguile/lightning/tests/rshr_u.c b/libguile/lightening/tests/rshr_u.c
similarity index 100%
rename from libguile/lightning/tests/rshr_u.c
rename to libguile/lightening/tests/rshr_u.c
diff --git a/libguile/lightning/tests/sqrtr_d.c b/libguile/lightening/tests/sqrtr_d.c
similarity index 100%
rename from libguile/lightning/tests/sqrtr_d.c
rename to libguile/lightening/tests/sqrtr_d.c
diff --git a/libguile/lightning/tests/sqrtr_f.c b/libguile/lightening/tests/sqrtr_f.c
similarity index 100%
rename from libguile/lightning/tests/sqrtr_f.c
rename to libguile/lightening/tests/sqrtr_f.c
diff --git a/libguile/lightning/tests/sti_c.c b/libguile/lightening/tests/sti_c.c
similarity index 100%
rename from libguile/lightning/tests/sti_c.c
rename to libguile/lightening/tests/sti_c.c
diff --git a/libguile/lightning/tests/sti_d.c b/libguile/lightening/tests/sti_d.c
similarity index 100%
rename from libguile/lightning/tests/sti_d.c
rename to libguile/lightening/tests/sti_d.c
diff --git a/libguile/lightning/tests/sti_f.c b/libguile/lightening/tests/sti_f.c
similarity index 100%
rename from libguile/lightning/tests/sti_f.c
rename to libguile/lightening/tests/sti_f.c
diff --git a/libguile/lightning/tests/sti_i.c b/libguile/lightening/tests/sti_i.c
similarity index 100%
rename from libguile/lightning/tests/sti_i.c
rename to libguile/lightening/tests/sti_i.c
diff --git a/libguile/lightning/tests/sti_l.c b/libguile/lightening/tests/sti_l.c
similarity index 100%
rename from libguile/lightning/tests/sti_l.c
rename to libguile/lightening/tests/sti_l.c
diff --git a/libguile/lightning/tests/sti_s.c b/libguile/lightening/tests/sti_s.c
similarity index 100%
rename from libguile/lightning/tests/sti_s.c
rename to libguile/lightening/tests/sti_s.c
diff --git a/libguile/lightning/tests/str_c.c b/libguile/lightening/tests/str_c.c
similarity index 100%
rename from libguile/lightning/tests/str_c.c
rename to libguile/lightening/tests/str_c.c
diff --git a/libguile/lightning/tests/str_d.c b/libguile/lightening/tests/str_d.c
similarity index 100%
rename from libguile/lightning/tests/str_d.c
rename to libguile/lightening/tests/str_d.c
diff --git a/libguile/lightning/tests/str_f.c b/libguile/lightening/tests/str_f.c
similarity index 100%
rename from libguile/lightning/tests/str_f.c
rename to libguile/lightening/tests/str_f.c
diff --git a/libguile/lightning/tests/str_i.c b/libguile/lightening/tests/str_i.c
similarity index 100%
rename from libguile/lightning/tests/str_i.c
rename to libguile/lightening/tests/str_i.c
diff --git a/libguile/lightning/tests/str_l.c b/libguile/lightening/tests/str_l.c
similarity index 100%
rename from libguile/lightning/tests/str_l.c
rename to libguile/lightening/tests/str_l.c
diff --git a/libguile/lightning/tests/str_s.c b/libguile/lightening/tests/str_s.c
similarity index 100%
rename from libguile/lightning/tests/str_s.c
rename to libguile/lightening/tests/str_s.c
diff --git a/libguile/lightning/tests/stxi_c.c b/libguile/lightening/tests/stxi_c.c
similarity index 100%
rename from libguile/lightning/tests/stxi_c.c
rename to libguile/lightening/tests/stxi_c.c
diff --git a/libguile/lightning/tests/stxi_d.c b/libguile/lightening/tests/stxi_d.c
similarity index 100%
rename from libguile/lightning/tests/stxi_d.c
rename to libguile/lightening/tests/stxi_d.c
diff --git a/libguile/lightning/tests/stxi_f.c b/libguile/lightening/tests/stxi_f.c
similarity index 100%
rename from libguile/lightning/tests/stxi_f.c
rename to libguile/lightening/tests/stxi_f.c
diff --git a/libguile/lightning/tests/stxi_i.c b/libguile/lightening/tests/stxi_i.c
similarity index 100%
rename from libguile/lightning/tests/stxi_i.c
rename to libguile/lightening/tests/stxi_i.c
diff --git a/libguile/lightning/tests/stxi_l.c b/libguile/lightening/tests/stxi_l.c
similarity index 100%
rename from libguile/lightning/tests/stxi_l.c
rename to libguile/lightening/tests/stxi_l.c
diff --git a/libguile/lightning/tests/stxi_s.c b/libguile/lightening/tests/stxi_s.c
similarity index 100%
rename from libguile/lightning/tests/stxi_s.c
rename to libguile/lightening/tests/stxi_s.c
diff --git a/libguile/lightning/tests/stxr_c.c b/libguile/lightening/tests/stxr_c.c
similarity index 100%
rename from libguile/lightning/tests/stxr_c.c
rename to libguile/lightening/tests/stxr_c.c
diff --git a/libguile/lightning/tests/stxr_d.c b/libguile/lightening/tests/stxr_d.c
similarity index 100%
rename from libguile/lightning/tests/stxr_d.c
rename to libguile/lightening/tests/stxr_d.c
diff --git a/libguile/lightning/tests/stxr_f.c b/libguile/lightening/tests/stxr_f.c
similarity index 100%
rename from libguile/lightning/tests/stxr_f.c
rename to libguile/lightening/tests/stxr_f.c
diff --git a/libguile/lightning/tests/stxr_i.c b/libguile/lightening/tests/stxr_i.c
similarity index 100%
rename from libguile/lightning/tests/stxr_i.c
rename to libguile/lightening/tests/stxr_i.c
diff --git a/libguile/lightning/tests/stxr_l.c b/libguile/lightening/tests/stxr_l.c
similarity index 100%
rename from libguile/lightning/tests/stxr_l.c
rename to libguile/lightening/tests/stxr_l.c
diff --git a/libguile/lightning/tests/stxr_s.c b/libguile/lightening/tests/stxr_s.c
similarity index 100%
rename from libguile/lightning/tests/stxr_s.c
rename to libguile/lightening/tests/stxr_s.c
diff --git a/libguile/lightning/tests/subr.c b/libguile/lightening/tests/subr.c
similarity index 100%
rename from libguile/lightning/tests/subr.c
rename to libguile/lightening/tests/subr.c
diff --git a/libguile/lightning/tests/subr_d.c b/libguile/lightening/tests/subr_d.c
similarity index 100%
rename from libguile/lightning/tests/subr_d.c
rename to libguile/lightening/tests/subr_d.c
diff --git a/libguile/lightning/tests/subr_f.c b/libguile/lightening/tests/subr_f.c
similarity index 100%
rename from libguile/lightning/tests/subr_f.c
rename to libguile/lightening/tests/subr_f.c
diff --git a/libguile/lightning/tests/subx.c b/libguile/lightening/tests/subx.c
similarity index 100%
rename from libguile/lightning/tests/subx.c
rename to libguile/lightening/tests/subx.c
diff --git a/libguile/lightning/tests/test.h b/libguile/lightening/tests/test.h
similarity index 100%
rename from libguile/lightning/tests/test.h
rename to libguile/lightening/tests/test.h
diff --git a/libguile/lightning/tests/truncr_d_i.c b/libguile/lightening/tests/truncr_d_i.c
similarity index 100%
rename from libguile/lightning/tests/truncr_d_i.c
rename to libguile/lightening/tests/truncr_d_i.c
diff --git a/libguile/lightning/tests/truncr_d_l.c b/libguile/lightening/tests/truncr_d_l.c
similarity index 100%
rename from libguile/lightning/tests/truncr_d_l.c
rename to libguile/lightening/tests/truncr_d_l.c
diff --git a/libguile/lightning/tests/truncr_f_i.c b/libguile/lightening/tests/truncr_f_i.c
similarity index 100%
rename from libguile/lightning/tests/truncr_f_i.c
rename to libguile/lightening/tests/truncr_f_i.c
diff --git a/libguile/lightning/tests/truncr_f_l.c b/libguile/lightening/tests/truncr_f_l.c
similarity index 100%
rename from libguile/lightning/tests/truncr_f_l.c
rename to libguile/lightening/tests/truncr_f_l.c
diff --git a/libguile/lightning/tests/xori.c b/libguile/lightening/tests/xori.c
similarity index 100%
rename from libguile/lightning/tests/xori.c
rename to libguile/lightening/tests/xori.c
diff --git a/libguile/lightning/tests/xorr.c b/libguile/lightening/tests/xorr.c
similarity index 100%
rename from libguile/lightning/tests/xorr.c
rename to libguile/lightening/tests/xorr.c
diff --git a/libguile/lightning/lightning.am b/libguile/lightning/lightning.am
deleted file mode 100644
index 878c147cb..000000000
--- a/libguile/lightning/lightning.am
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Copyright 2000, 2001, 2002, 2012-2019 Free Software Foundation, Inc.
-#
-# This file is part of GNU lightning.
-#
-# GNU lightning is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GNU lightning is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-# License for more details.
-#
-
-lightning = $(top_srcdir)/libguile/lightning
-
-lightning_c_files = 					\
-	$(lightning)/jit/jit.c
-
-lightning_extra_files =					\
-	$(lightning)/AUTHORS				\
-	$(lightning)/ChangeLog				\
-	$(lightning)/ChangeLog.lightning		\
-	$(lightning)/COPYING				\
-	$(lightning)/COPYING.DOC			\
-	$(lightning)/COPYING.LESSER			\
-	$(lightning)/lightning.am			\
-	$(lightning)/lightning.texi			\
-	$(lightning)/NEWS				\
-	$(lightning)/README.md				\
-	$(lightning)/THANKS				\
-							\
-	$(lightning)/jit.h				\
-							\
-	$(lightning)/jit/arm.h				\
-	$(lightning)/jit/mips.h				\
-	$(lightning)/jit/ppc.h				\
-	$(lightning)/jit/sparc.h			\
-	$(lightning)/jit/x86.h				\
-	$(lightning)/jit/ia64.h				\
-	$(lightning)/jit/hppa.h				\
-	$(lightning)/jit/aarch64.h			\
-	$(lightning)/jit/s390.h				\
-	$(lightning)/jit/alpha.h			\
-							\
-	$(lightning)/jit/aarch64.c			\
-	$(lightning)/jit/aarch64-cpu.c			\
-	$(lightning)/jit/aarch64-fpu.c			\
-	$(lightning)/jit/alpha.c			\
-	$(lightning)/jit/alpha-cpu.c			\
-	$(lightning)/jit/alpha-fpu.c			\
-	$(lightning)/jit/arm.c				\
-	$(lightning)/jit/arm-cpu.c			\
-	$(lightning)/jit/arm-swf.c			\
-	$(lightning)/jit/arm-vfp.c			\
-	$(lightning)/jit/hppa.c				\
-	$(lightning)/jit/hppa-cpu.c			\
-	$(lightning)/jit/hppa-fpu.c			\
-	$(lightning)/jit/ia64.c				\
-	$(lightning)/jit/ia64-cpu.c			\
-	$(lightning)/jit/ia64-fpu.c			\
-	$(lightning)/jit/mips.c				\
-	$(lightning)/jit/mips-cpu.c			\
-	$(lightning)/jit/mips-fpu.c			\
-	$(lightning)/jit/ppc.c				\
-	$(lightning)/jit/ppc-cpu.c			\
-	$(lightning)/jit/ppc-fpu.c			\
-	$(lightning)/jit/s390.c				\
-	$(lightning)/jit/s390-cpu.c			\
-	$(lightning)/jit/s390-fpu.c			\
-	$(lightning)/jit/sparc.c			\
-	$(lightning)/jit/sparc-cpu.c			\
-	$(lightning)/jit/sparc-fpu.c			\
-	$(lightning)/jit/x86.c				\
-	$(lightning)/jit/x86-cpu.c			\
-	$(lightning)/jit/x86-sse.c