diff --git a/src/lisp/+roswell-internal-core-build.ros b/src/+roswell-internal-core-build.ros
similarity index 100%
rename from src/lisp/+roswell-internal-core-build.ros
rename to src/+roswell-internal-core-build.ros
diff --git a/src/Makefile.am b/src/Makefile.am
index f616cd8..68a968c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -DLISP_PATH=\"$(roslispdir)\" -DMAN_PATH=\"$(mandir)\"
 roslispdir = $(datadir)/common-lisp/source/$(PACKAGE)
-roslisp_DATA = $(wildcard lisp/*.lisp) $(wildcard lisp/*.ros)
+roslisp_DATA = $(wildcard *.lisp) $(wildcard *.ros)
 
 gend.h: FORCE
 	printf "#define ROS_COMPILE_ENVIRONMENT \"%s\"\n" "`$(CC) --version|head -n 1`" > $@.tmp
diff --git a/src/lisp/asdf.ros b/src/asdf.ros
similarity index 100%
rename from src/lisp/asdf.ros
rename to src/asdf.ros
diff --git a/src/lisp/build.ros b/src/build.ros
similarity index 100%
rename from src/lisp/build.ros
rename to src/build.ros
diff --git a/src/lisp/delete.ros b/src/delete.ros
similarity index 100%
rename from src/lisp/delete.ros
rename to src/delete.ros
diff --git a/src/lisp/dump.ros b/src/dump.ros
similarity index 100%
rename from src/lisp/dump.ros
rename to src/dump.ros
diff --git a/src/lisp/emacs.ros b/src/emacs.ros
similarity index 100%
rename from src/lisp/emacs.ros
rename to src/emacs.ros
diff --git a/src/lisp/init.lisp b/src/init.lisp
similarity index 100%
rename from src/lisp/init.lisp
rename to src/init.lisp
diff --git a/src/lisp/init.ros b/src/init.ros
similarity index 100%
rename from src/lisp/init.ros
rename to src/init.ros
diff --git a/src/lisp/install+7zip.lisp b/src/install+7zip.lisp
similarity index 100%
rename from src/lisp/install+7zip.lisp
rename to src/install+7zip.lisp
diff --git a/src/lisp/install+abcl-bin.lisp b/src/install+abcl-bin.lisp
similarity index 100%
rename from src/lisp/install+abcl-bin.lisp
rename to src/install+abcl-bin.lisp
diff --git a/src/lisp/install+asdf3.lisp b/src/install+asdf3.lisp
similarity index 100%
rename from src/lisp/install+asdf3.lisp
rename to src/install+asdf3.lisp
diff --git a/src/lisp/install+ffcall.lisp b/src/install+ffcall.lisp
similarity index 100%
rename from src/lisp/install+ffcall.lisp
rename to src/install+ffcall.lisp
diff --git a/src/lisp/install+msys2.lisp b/src/install+msys2.lisp
similarity index 100%
rename from src/lisp/install+msys2.lisp
rename to src/install+msys2.lisp
diff --git a/src/lisp/install+quicklisp.lisp b/src/install+quicklisp.lisp
similarity index 100%
rename from src/lisp/install+quicklisp.lisp
rename to src/install+quicklisp.lisp
diff --git a/src/lisp/install+sigsegv.lisp b/src/install+sigsegv.lisp
similarity index 100%
rename from src/lisp/install+sigsegv.lisp
rename to src/install+sigsegv.lisp
diff --git a/src/lisp/install-ccl-bin.lisp b/src/install-ccl-bin.lisp
similarity index 100%
rename from src/lisp/install-ccl-bin.lisp
rename to src/install-ccl-bin.lisp
diff --git a/src/lisp/install-clisp.lisp b/src/install-clisp.lisp
similarity index 100%
rename from src/lisp/install-clisp.lisp
rename to src/install-clisp.lisp
diff --git a/src/lisp/install-ecl.lisp b/src/install-ecl.lisp
similarity index 100%
rename from src/lisp/install-ecl.lisp
rename to src/install-ecl.lisp
diff --git a/src/lisp/install-sbcl-bin.lisp b/src/install-sbcl-bin.lisp
similarity index 100%
rename from src/lisp/install-sbcl-bin.lisp
rename to src/install-sbcl-bin.lisp
diff --git a/src/lisp/install-sbcl.lisp b/src/install-sbcl.lisp
similarity index 100%
rename from src/lisp/install-sbcl.lisp
rename to src/install-sbcl.lisp
diff --git a/src/lisp/install.lisp b/src/install.lisp
similarity index 100%
rename from src/lisp/install.lisp
rename to src/install.lisp
diff --git a/src/lisp/list.ros b/src/list.ros
similarity index 100%
rename from src/lisp/list.ros
rename to src/list.ros
diff --git a/src/lisp/use.ros b/src/use.ros
similarity index 100%
rename from src/lisp/use.ros
rename to src/use.ros
diff --git a/src/lisp/wait.ros b/src/wait.ros
similarity index 100%
rename from src/lisp/wait.ros
rename to src/wait.ros