diff --git a/femtolisp/.gitignore b/.gitignore
similarity index 79%
rename from femtolisp/.gitignore
rename to .gitignore
index 5ae7457..a01faaa 100644
--- a/femtolisp/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /*.o
 /*.do
 /*.a
+/*.da
 /flisp
diff --git a/femtolisp/FLOSSING b/FLOSSING
similarity index 100%
rename from femtolisp/FLOSSING
rename to FLOSSING
diff --git a/femtolisp/LICENSE b/LICENSE
similarity index 100%
rename from femtolisp/LICENSE
rename to LICENSE
diff --git a/femtolisp/Makefile b/Makefile
similarity index 96%
rename from femtolisp/Makefile
rename to Makefile
index 06ba51e..dc815ae 100644
--- a/femtolisp/Makefile
+++ b/Makefile
@@ -56,3 +56,5 @@ clean:
 	rm -f *.o
 	rm -f *.do
 	rm -f $(EXENAME)
+	rm -f $(LIBTARGET).a
+	rm -f $(LIBTARGET).da
diff --git a/femtolisp/Makefile.macosx b/Makefile.macosx
similarity index 100%
rename from femtolisp/Makefile.macosx
rename to Makefile.macosx
diff --git a/femtolisp/README.md b/README.md
similarity index 100%
rename from femtolisp/README.md
rename to README.md
diff --git a/femtolisp/aliases.scm b/aliases.scm
similarity index 100%
rename from femtolisp/aliases.scm
rename to aliases.scm
diff --git a/femtolisp/ascii-mona-lisa b/ascii-mona-lisa
similarity index 100%
rename from femtolisp/ascii-mona-lisa
rename to ascii-mona-lisa
diff --git a/femtolisp/ascii-mona-lisa-2 b/ascii-mona-lisa-2
similarity index 100%
rename from femtolisp/ascii-mona-lisa-2
rename to ascii-mona-lisa-2
diff --git a/femtolisp/attic/dict.lsp b/attic/dict.lsp
similarity index 100%
rename from femtolisp/attic/dict.lsp
rename to attic/dict.lsp
diff --git a/femtolisp/attic/flutils.c b/attic/flutils.c
similarity index 100%
rename from femtolisp/attic/flutils.c
rename to attic/flutils.c
diff --git a/femtolisp/attic/plists.lsp b/attic/plists.lsp
similarity index 100%
rename from femtolisp/attic/plists.lsp
rename to attic/plists.lsp
diff --git a/femtolisp/attic/s.c b/attic/s.c
similarity index 100%
rename from femtolisp/attic/s.c
rename to attic/s.c
diff --git a/femtolisp/attic/scrap.lsp b/attic/scrap.lsp
similarity index 100%
rename from femtolisp/attic/scrap.lsp
rename to attic/scrap.lsp
diff --git a/femtolisp/attic/system-old.lsp b/attic/system-old.lsp
similarity index 100%
rename from femtolisp/attic/system-old.lsp
rename to attic/system-old.lsp
diff --git a/femtolisp/attic/trash.c b/attic/trash.c
similarity index 100%
rename from femtolisp/attic/trash.c
rename to attic/trash.c
diff --git a/femtolisp/bootstrap.sh b/bootstrap.sh
similarity index 100%
rename from femtolisp/bootstrap.sh
rename to bootstrap.sh
diff --git a/femtolisp/builtins.c b/builtins.c
similarity index 100%
rename from femtolisp/builtins.c
rename to builtins.c
diff --git a/femtolisp/compiler.lsp b/compiler.lsp
similarity index 100%
rename from femtolisp/compiler.lsp
rename to compiler.lsp
diff --git a/femtolisp/cvalues.c b/cvalues.c
similarity index 100%
rename from femtolisp/cvalues.c
rename to cvalues.c
diff --git a/femtolisp/equal.c b/equal.c
similarity index 100%
rename from femtolisp/equal.c
rename to equal.c
diff --git a/femtolisp/equalhash.c b/equalhash.c
similarity index 100%
rename from femtolisp/equalhash.c
rename to equalhash.c
diff --git a/femtolisp/equalhash.h b/equalhash.h
similarity index 100%
rename from femtolisp/equalhash.h
rename to equalhash.h
diff --git a/femtolisp/examples/bq.scm b/examples/bq.scm
similarity index 100%
rename from femtolisp/examples/bq.scm
rename to examples/bq.scm
diff --git a/femtolisp/examples/cps.lsp b/examples/cps.lsp
similarity index 100%
rename from femtolisp/examples/cps.lsp
rename to examples/cps.lsp
diff --git a/femtolisp/examples/rule30.lsp b/examples/rule30.lsp
similarity index 100%
rename from femtolisp/examples/rule30.lsp
rename to examples/rule30.lsp
diff --git a/femtolisp/flisp.boot b/flisp.boot
similarity index 100%
rename from femtolisp/flisp.boot
rename to flisp.boot
diff --git a/femtolisp/flisp.c b/flisp.c
similarity index 100%
rename from femtolisp/flisp.c
rename to flisp.c
diff --git a/femtolisp/flisp.h b/flisp.h
similarity index 100%
rename from femtolisp/flisp.h
rename to flisp.h
diff --git a/femtolisp/flmain.c b/flmain.c
similarity index 100%
rename from femtolisp/flmain.c
rename to flmain.c
diff --git a/femtolisp/iostream.c b/iostream.c
similarity index 100%
rename from femtolisp/iostream.c
rename to iostream.c
diff --git a/femtolisp/lib/lazy.scm b/lib/lazy.scm
similarity index 100%
rename from femtolisp/lib/lazy.scm
rename to lib/lazy.scm
diff --git a/femtolisp/lib/psyntax.pp b/lib/psyntax.pp
similarity index 100%
rename from femtolisp/lib/psyntax.pp
rename to lib/psyntax.pp
diff --git a/femtolisp/lib/psyntax.ss b/lib/psyntax.ss
similarity index 100%
rename from femtolisp/lib/psyntax.ss
rename to lib/psyntax.ss
diff --git a/femtolisp/lib/sort.scm b/lib/sort.scm
similarity index 100%
rename from femtolisp/lib/sort.scm
rename to lib/sort.scm
diff --git a/femtolisp/mkboot0.lsp b/mkboot0.lsp
similarity index 100%
rename from femtolisp/mkboot0.lsp
rename to mkboot0.lsp
diff --git a/femtolisp/mkboot1.lsp b/mkboot1.lsp
similarity index 100%
rename from femtolisp/mkboot1.lsp
rename to mkboot1.lsp
diff --git a/femtolisp/opaque_type_template.c b/opaque_type_template.c
similarity index 100%
rename from femtolisp/opaque_type_template.c
rename to opaque_type_template.c
diff --git a/femtolisp/opcodes.h b/opcodes.h
similarity index 100%
rename from femtolisp/opcodes.h
rename to opcodes.h
diff --git a/femtolisp/print.c b/print.c
similarity index 100%
rename from femtolisp/print.c
rename to print.c
diff --git a/femtolisp/read.c b/read.c
similarity index 100%
rename from femtolisp/read.c
rename to read.c
diff --git a/femtolisp/string.c b/string.c
similarity index 100%
rename from femtolisp/string.c
rename to string.c
diff --git a/femtolisp/system.lsp b/system.lsp
similarity index 100%
rename from femtolisp/system.lsp
rename to system.lsp
diff --git a/femtolisp/table.c b/table.c
similarity index 100%
rename from femtolisp/table.c
rename to table.c
diff --git a/femtolisp/tests/100x100.lsp b/tests/100x100.lsp
similarity index 100%
rename from femtolisp/tests/100x100.lsp
rename to tests/100x100.lsp
diff --git a/femtolisp/tests/argv.lsp b/tests/argv.lsp
similarity index 100%
rename from femtolisp/tests/argv.lsp
rename to tests/argv.lsp
diff --git a/femtolisp/tests/ast/asttools.lsp b/tests/ast/asttools.lsp
similarity index 100%
rename from femtolisp/tests/ast/asttools.lsp
rename to tests/ast/asttools.lsp
diff --git a/femtolisp/tests/ast/datetimeR.lsp b/tests/ast/datetimeR.lsp
similarity index 100%
rename from femtolisp/tests/ast/datetimeR.lsp
rename to tests/ast/datetimeR.lsp
diff --git a/femtolisp/tests/ast/match.lsp b/tests/ast/match.lsp
similarity index 100%
rename from femtolisp/tests/ast/match.lsp
rename to tests/ast/match.lsp
diff --git a/femtolisp/tests/ast/match.scm b/tests/ast/match.scm
similarity index 100%
rename from femtolisp/tests/ast/match.scm
rename to tests/ast/match.scm
diff --git a/femtolisp/tests/ast/rpasses-out.lsp b/tests/ast/rpasses-out.lsp
similarity index 100%
rename from femtolisp/tests/ast/rpasses-out.lsp
rename to tests/ast/rpasses-out.lsp
diff --git a/femtolisp/tests/ast/rpasses.lsp b/tests/ast/rpasses.lsp
similarity index 100%
rename from femtolisp/tests/ast/rpasses.lsp
rename to tests/ast/rpasses.lsp
diff --git a/femtolisp/tests/color.lsp b/tests/color.lsp
similarity index 100%
rename from femtolisp/tests/color.lsp
rename to tests/color.lsp
diff --git a/femtolisp/tests/equal.scm b/tests/equal.scm
similarity index 100%
rename from femtolisp/tests/equal.scm
rename to tests/equal.scm
diff --git a/femtolisp/tests/err.lsp b/tests/err.lsp
similarity index 100%
rename from femtolisp/tests/err.lsp
rename to tests/err.lsp
diff --git a/femtolisp/tests/hashtest.lsp b/tests/hashtest.lsp
similarity index 100%
rename from femtolisp/tests/hashtest.lsp
rename to tests/hashtest.lsp
diff --git a/femtolisp/tests/perf.lsp b/tests/perf.lsp
similarity index 100%
rename from femtolisp/tests/perf.lsp
rename to tests/perf.lsp
diff --git a/femtolisp/tests/pisum.lsp b/tests/pisum.lsp
similarity index 100%
rename from femtolisp/tests/pisum.lsp
rename to tests/pisum.lsp
diff --git a/femtolisp/tests/printcases.lsp b/tests/printcases.lsp
similarity index 100%
rename from femtolisp/tests/printcases.lsp
rename to tests/printcases.lsp
diff --git a/femtolisp/tests/tcolor.lsp b/tests/tcolor.lsp
similarity index 100%
rename from femtolisp/tests/tcolor.lsp
rename to tests/tcolor.lsp
diff --git a/femtolisp/tests/test.lsp b/tests/test.lsp
similarity index 100%
rename from femtolisp/tests/test.lsp
rename to tests/test.lsp
diff --git a/femtolisp/tests/tme.lsp b/tests/tme.lsp
similarity index 100%
rename from femtolisp/tests/tme.lsp
rename to tests/tme.lsp
diff --git a/femtolisp/tests/torture.scm b/tests/torture.scm
similarity index 100%
rename from femtolisp/tests/torture.scm
rename to tests/torture.scm
diff --git a/femtolisp/tests/torus.lsp b/tests/torus.lsp
similarity index 100%
rename from femtolisp/tests/torus.lsp
rename to tests/torus.lsp
diff --git a/femtolisp/tests/unittest.lsp b/tests/unittest.lsp
similarity index 100%
rename from femtolisp/tests/unittest.lsp
rename to tests/unittest.lsp
diff --git a/femtolisp/tests/wt.lsp b/tests/wt.lsp
similarity index 100%
rename from femtolisp/tests/wt.lsp
rename to tests/wt.lsp
diff --git a/femtolisp/tiny/Makefile b/tiny/Makefile
similarity index 100%
rename from femtolisp/tiny/Makefile
rename to tiny/Makefile
diff --git a/femtolisp/tiny/eval1 b/tiny/eval1
similarity index 100%
rename from femtolisp/tiny/eval1
rename to tiny/eval1
diff --git a/femtolisp/tiny/eval2 b/tiny/eval2
similarity index 100%
rename from femtolisp/tiny/eval2
rename to tiny/eval2
diff --git a/femtolisp/tiny/evalt b/tiny/evalt
similarity index 100%
rename from femtolisp/tiny/evalt
rename to tiny/evalt
diff --git a/femtolisp/tiny/flutils.c b/tiny/flutils.c
similarity index 100%
rename from femtolisp/tiny/flutils.c
rename to tiny/flutils.c
diff --git a/femtolisp/tiny/lisp-nontail.c b/tiny/lisp-nontail.c
similarity index 100%
rename from femtolisp/tiny/lisp-nontail.c
rename to tiny/lisp-nontail.c
diff --git a/femtolisp/tiny/lisp.c b/tiny/lisp.c
similarity index 100%
rename from femtolisp/tiny/lisp.c
rename to tiny/lisp.c
diff --git a/femtolisp/tiny/lisp2.c b/tiny/lisp2.c
similarity index 100%
rename from femtolisp/tiny/lisp2.c
rename to tiny/lisp2.c
diff --git a/femtolisp/tiny/lisp2.c.bak b/tiny/lisp2.c.bak
similarity index 100%
rename from femtolisp/tiny/lisp2.c.bak
rename to tiny/lisp2.c.bak
diff --git a/femtolisp/tiny/lispf.c b/tiny/lispf.c
similarity index 100%
rename from femtolisp/tiny/lispf.c
rename to tiny/lispf.c
diff --git a/femtolisp/tiny/scrap.c b/tiny/scrap.c
similarity index 100%
rename from femtolisp/tiny/scrap.c
rename to tiny/scrap.c
diff --git a/femtolisp/tiny/system.lsp b/tiny/system.lsp
similarity index 100%
rename from femtolisp/tiny/system.lsp
rename to tiny/system.lsp
diff --git a/femtolisp/todo b/todo
similarity index 100%
rename from femtolisp/todo
rename to todo
diff --git a/femtolisp/todo-scrap b/todo-scrap
similarity index 100%
rename from femtolisp/todo-scrap
rename to todo-scrap
diff --git a/femtolisp/types.c b/types.c
similarity index 100%
rename from femtolisp/types.c
rename to types.c