diff --git a/.gitignore b/.gitignore
index c4f84e7..f224f3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,17 @@
-/Chf/mt_build/
-/Chf/st_build/
+/src/libChf/mt_build/
+/src/libChf/st_build/
+/src/*.o
+manual/saturn.toc
+manual/saturn.aux
+manual/saturn.cp
+manual/saturn.cps
+manual/saturn.dvi
+manual/saturn.info
+manual/saturn.pdf
+manual/saturn.ps
+
 dist/pack
 dist/saturn
-/src/*.o
-docs/saturn.toc
-docs/saturn.aux
-docs/saturn.cp
-docs/saturn.cps
-docs/saturn.dvi
-docs/saturn.info
-docs/saturn.pdf
-docs/saturn.ps
-
 dist/Saturn
 dist/pack
 dist/saturn
diff --git a/Makefile b/Makefile
index 6fb8169..4917fc4 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CC ?= gcc
 
 OPTIM ?= 2
 
-CFLAGS = -g -O$(OPTIM) -I./src/ -D_GNU_SOURCE=1 -I./Chf -L./Chf/st_build -lutil
+CFLAGS = -g -O$(OPTIM) -I./src/ -D_GNU_SOURCE=1 -I./src/libChf -L./src/libChf/st_build -lutil
 LIBS = -lm -lChf -lXm
 
 X11CFLAGS = $(shell pkg-config --cflags x11 xext) -D_GNU_SOURCE=1
@@ -50,20 +50,20 @@ MSFS=	src/debug.msf \
 	src/x_func.msf \
 	src/saturn.msf \
 	src/util.msf \
-	Chf/chf.msf
+	src/libChf/chf.msf
 
 .PHONY: all clean clean-all pretty-code install mrproper
 
-all: Chf/st_build/libChf.a dist/saturn dist/pack dist/saturn.cat docs
+all: src/libChf/st_build/libChf.a dist/saturn dist/pack dist/saturn.cat manual
 
 # Binaries
-Chf/st_build/libChf.a:
-	make -C Chf
+src/libChf/st_build/libChf.a:
+	make -C src/libChf
 
-dist/saturn: $(DOTOS) Chf/st_build/libChf.a
+dist/saturn: $(DOTOS) src/libChf/st_build/src/libChf.a
 	$(CC) $^ -o $@ $(CFLAGS) $(LIBS)
 
-dist/pack: src/pack.o src/disk_io.o src/debug.o Chf/st_build/libChf.a
+dist/pack: src/pack.o src/disk_io.o src/debug.o src/libChf/st_build/libChf.a
 	$(CC) $^ -o $@ $(CFLAGS) $(LIBS)
 
 dist/saturn.cat: $(MSFS)
@@ -71,14 +71,14 @@ dist/saturn.cat: $(MSFS)
 	  do gencat $@ $$msf ; \
 	done
 
-docs:
-	make -C docs
+manual:
+	make -C manual
 
 # Cleaning
 clean:
 	rm -f src/*.o
-	make -C Chf clean
-	make -C docs clean
+	make -C src/libChf clean
+	make -C manual clean
 
 mrproper: clean
 	rm -f dist/pack dist/saturn dist/saturn.cat
diff --git a/BUGS.txt b/docs-4.1.1.1/BUGS.txt
similarity index 100%
rename from BUGS.txt
rename to docs-4.1.1.1/BUGS.txt
diff --git a/legacy_docs/INSTALL.txt b/docs-4.1.1.1/INSTALL.txt
similarity index 100%
rename from legacy_docs/INSTALL.txt
rename to docs-4.1.1.1/INSTALL.txt
diff --git a/README.txt b/docs-4.1.1.1/README.txt
similarity index 100%
rename from README.txt
rename to docs-4.1.1.1/README.txt
diff --git a/legacy_docs/quick_start b/docs-4.1.1.1/quick_start
similarity index 100%
rename from legacy_docs/quick_start
rename to docs-4.1.1.1/quick_start
diff --git a/docs/Makefile b/manual/Makefile
similarity index 100%
rename from docs/Makefile
rename to manual/Makefile
diff --git a/docs/cindex.texi b/manual/cindex.texi
similarity index 100%
rename from docs/cindex.texi
rename to manual/cindex.texi
diff --git a/docs/clopt.texi b/manual/clopt.texi
similarity index 100%
rename from docs/clopt.texi
rename to manual/clopt.texi
diff --git a/docs/custom.texi b/manual/custom.texi
similarity index 100%
rename from docs/custom.texi
rename to manual/custom.texi
diff --git a/docs/gpl.texi b/manual/gpl.texi
similarity index 100%
rename from docs/gpl.texi
rename to manual/gpl.texi
diff --git a/docs/introd.texi b/manual/introd.texi
similarity index 100%
rename from docs/introd.texi
rename to manual/introd.texi
diff --git a/docs/prep.texi b/manual/prep.texi
similarity index 100%
rename from docs/prep.texi
rename to manual/prep.texi
diff --git a/docs/saturn.texi b/manual/saturn.texi
similarity index 100%
rename from docs/saturn.texi
rename to manual/saturn.texi
diff --git a/docs/sutil.texi b/manual/sutil.texi
similarity index 100%
rename from docs/sutil.texi
rename to manual/sutil.texi
diff --git a/docs/tips.texi b/manual/tips.texi
similarity index 100%
rename from docs/tips.texi
rename to manual/tips.texi
diff --git a/docs/using.texi b/manual/using.texi
similarity index 100%
rename from docs/using.texi
rename to manual/using.texi
diff --git a/Chf/Bugs b/src/libChf/Bugs
similarity index 100%
rename from Chf/Bugs
rename to src/libChf/Bugs
diff --git a/Chf/Chf.h b/src/libChf/Chf.h
similarity index 100%
rename from Chf/Chf.h
rename to src/libChf/Chf.h
diff --git a/Chf/ChfPriv.h b/src/libChf/ChfPriv.h
similarity index 100%
rename from Chf/ChfPriv.h
rename to src/libChf/ChfPriv.h
diff --git a/Chf/Makefile b/src/libChf/Makefile
similarity index 100%
rename from Chf/Makefile
rename to src/libChf/Makefile
diff --git a/Chf/Makefile_def b/src/libChf/Makefile_def
similarity index 100%
rename from Chf/Makefile_def
rename to src/libChf/Makefile_def
diff --git a/Chf/Makefile_sub b/src/libChf/Makefile_sub
similarity index 100%
rename from Chf/Makefile_sub
rename to src/libChf/Makefile_sub
diff --git a/Chf/chf.msf b/src/libChf/chf.msf
similarity index 100%
rename from Chf/chf.msf
rename to src/libChf/chf.msf
diff --git a/Chf/chf.rc b/src/libChf/chf.rc
similarity index 100%
rename from Chf/chf.rc
rename to src/libChf/chf.rc
diff --git a/Chf/chf.texi b/src/libChf/chf.texi
similarity index 100%
rename from Chf/chf.texi
rename to src/libChf/chf.texi
diff --git a/Chf/chf_abrt.c b/src/libChf/chf_abrt.c
similarity index 100%
rename from Chf/chf_abrt.c
rename to src/libChf/chf_abrt.c
diff --git a/Chf/chf_gen.c b/src/libChf/chf_gen.c
similarity index 100%
rename from Chf/chf_gen.c
rename to src/libChf/chf_gen.c
diff --git a/Chf/chf_hdlr.c b/src/libChf/chf_hdlr.c
similarity index 100%
rename from Chf/chf_hdlr.c
rename to src/libChf/chf_hdlr.c
diff --git a/Chf/chf_init.c b/src/libChf/chf_init.c
similarity index 100%
rename from Chf/chf_init.c
rename to src/libChf/chf_init.c
diff --git a/Chf/chf_msgc.c b/src/libChf/chf_msgc.c
similarity index 100%
rename from Chf/chf_msgc.c
rename to src/libChf/chf_msgc.c
diff --git a/Chf/chf_sig.c b/src/libChf/chf_sig.c
similarity index 100%
rename from Chf/chf_sig.c
rename to src/libChf/chf_sig.c
diff --git a/Chf/chf_st.c b/src/libChf/chf_st.c
similarity index 100%
rename from Chf/chf_st.c
rename to src/libChf/chf_st.c
diff --git a/Chf/chf_top.c b/src/libChf/chf_top.c
similarity index 100%
rename from Chf/chf_top.c
rename to src/libChf/chf_top.c
diff --git a/Chf/chf_win32.c b/src/libChf/chf_win32.c
similarity index 100%
rename from Chf/chf_win32.c
rename to src/libChf/chf_win32.c
diff --git a/Chf/libChf.vcp b/src/libChf/libChf.vcp
similarity index 100%
rename from Chf/libChf.vcp
rename to src/libChf/libChf.vcp
diff --git a/Chf/resource.h b/src/libChf/resource.h
similarity index 100%
rename from Chf/resource.h
rename to src/libChf/resource.h
diff --git a/Chf/test01.c b/src/libChf/test01.c
similarity index 100%
rename from Chf/test01.c
rename to src/libChf/test01.c
diff --git a/Chf/test01.msf b/src/libChf/test01.msf
similarity index 100%
rename from Chf/test01.msf
rename to src/libChf/test01.msf
diff --git a/Chf/test02.c b/src/libChf/test02.c
similarity index 100%
rename from Chf/test02.c
rename to src/libChf/test02.c
diff --git a/Chf/test03.c b/src/libChf/test03.c
similarity index 100%
rename from Chf/test03.c
rename to src/libChf/test03.c
diff --git a/Chf/test04.c b/src/libChf/test04.c
similarity index 100%
rename from Chf/test04.c
rename to src/libChf/test04.c
diff --git a/Chf/test05.c b/src/libChf/test05.c
similarity index 100%
rename from Chf/test05.c
rename to src/libChf/test05.c
diff --git a/Chf/test06.c b/src/libChf/test06.c
similarity index 100%
rename from Chf/test06.c
rename to src/libChf/test06.c
diff --git a/Chf/test07.c b/src/libChf/test07.c
similarity index 100%
rename from Chf/test07.c
rename to src/libChf/test07.c