diff --git a/.gitignore b/.gitignore
index 5d48ab8..c657bb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-obj/*.o
-obj/*.gch
+*.o
+*.gch
+*.out
 csope
-**/*.out
-src/lex.yy.c
+source/lex.yy.c
 main.plist
diff --git a/docs/BUGS b/documentation/BUGS
similarity index 100%
rename from docs/BUGS
rename to documentation/BUGS
diff --git a/docs/TODO b/documentation/TODO
similarity index 100%
rename from docs/TODO
rename to documentation/TODO
diff --git a/docs/after.jpg b/documentation/after.jpg
similarity index 100%
rename from docs/after.jpg
rename to documentation/after.jpg
diff --git a/docs/after.old.jpg b/documentation/after.old.jpg
similarity index 100%
rename from docs/after.old.jpg
rename to documentation/after.old.jpg
diff --git a/docs/before.jpg b/documentation/before.jpg
similarity index 100%
rename from docs/before.jpg
rename to documentation/before.jpg
diff --git a/docs/before.old.jpg b/documentation/before.old.jpg
similarity index 100%
rename from docs/before.old.jpg
rename to documentation/before.old.jpg
diff --git a/docs/cscope.1.bz2 b/documentation/cscope.1.bz2
similarity index 100%
rename from docs/cscope.1.bz2
rename to documentation/cscope.1.bz2
diff --git a/docs/csope.GIF b/documentation/csope.GIF
similarity index 100%
rename from docs/csope.GIF
rename to documentation/csope.GIF
diff --git a/docs/dev_man.md b/documentation/dev_man.md
similarity index 100%
rename from docs/dev_man.md
rename to documentation/dev_man.md
diff --git a/docs/original_site_-_Cscope_Home_Page.html b/documentation/original_site_-_Cscope_Home_Page.html
similarity index 100%
rename from docs/original_site_-_Cscope_Home_Page.html
rename to documentation/original_site_-_Cscope_Home_Page.html
diff --git a/obj/.placeholder b/object/.placeholder
similarity index 100%
rename from obj/.placeholder
rename to object/.placeholder
diff --git a/ass/emacs.e b/scripts/emacs.e
similarity index 100%
rename from ass/emacs.e
rename to scripts/emacs.e
diff --git a/ass/gmacs.ml b/scripts/gmacs.ml
similarity index 100%
rename from ass/gmacs.ml
rename to scripts/gmacs.ml
diff --git a/ass/ylwrap b/scripts/ylwrap
similarity index 100%
rename from ass/ylwrap
rename to scripts/ylwrap
diff --git a/src/build.c b/source/build.c
similarity index 100%
rename from src/build.c
rename to source/build.c
diff --git a/src/build.h b/source/build.h
similarity index 100%
rename from src/build.h
rename to source/build.h
diff --git a/src/command.c b/source/command.c
similarity index 100%
rename from src/command.c
rename to source/command.c
diff --git a/src/constants.h b/source/constants.h
similarity index 100%
rename from src/constants.h
rename to source/constants.h
diff --git a/src/crossref.c b/source/crossref.c
similarity index 100%
rename from src/crossref.c
rename to source/crossref.c
diff --git a/src/dir.c b/source/dir.c
similarity index 100%
rename from src/dir.c
rename to source/dir.c
diff --git a/src/display.c b/source/display.c
similarity index 100%
rename from src/display.c
rename to source/display.c
diff --git a/src/edit.c b/source/edit.c
similarity index 100%
rename from src/edit.c
rename to source/edit.c
diff --git a/src/egrep.c b/source/egrep.c
similarity index 100%
rename from src/egrep.c
rename to source/egrep.c
diff --git a/src/egrep.h b/source/egrep.h
similarity index 100%
rename from src/egrep.h
rename to source/egrep.h
diff --git a/src/egrep.y b/source/egrep.y
similarity index 100%
rename from src/egrep.y
rename to source/egrep.y
diff --git a/src/exec.c b/source/exec.c
similarity index 100%
rename from src/exec.c
rename to source/exec.c
diff --git a/src/find.c b/source/find.c
similarity index 100%
rename from src/find.c
rename to source/find.c
diff --git a/src/fscanner.l b/source/fscanner.l
similarity index 100%
rename from src/fscanner.l
rename to source/fscanner.l
diff --git a/src/global.h b/source/global.h
similarity index 100%
rename from src/global.h
rename to source/global.h
diff --git a/src/gscope.c b/source/gscope.c
similarity index 100%
rename from src/gscope.c
rename to source/gscope.c
diff --git a/src/help.c b/source/help.c
similarity index 100%
rename from src/help.c
rename to source/help.c
diff --git a/src/input.c b/source/input.c
similarity index 100%
rename from src/input.c
rename to source/input.c
diff --git a/src/invlib.c b/source/invlib.c
similarity index 100%
rename from src/invlib.c
rename to source/invlib.c
diff --git a/src/invlib.h b/source/invlib.h
similarity index 100%
rename from src/invlib.h
rename to source/invlib.h
diff --git a/src/keys.h b/source/keys.h
similarity index 100%
rename from src/keys.h
rename to source/keys.h
diff --git a/src/library.h b/source/library.h
similarity index 100%
rename from src/library.h
rename to source/library.h
diff --git a/src/logdir.c b/source/logdir.c
similarity index 100%
rename from src/logdir.c
rename to source/logdir.c
diff --git a/src/lookup.c b/source/lookup.c
similarity index 100%
rename from src/lookup.c
rename to source/lookup.c
diff --git a/src/lookup.h b/source/lookup.h
similarity index 100%
rename from src/lookup.h
rename to source/lookup.h
diff --git a/src/main.c b/source/main.c
similarity index 100%
rename from src/main.c
rename to source/main.c
diff --git a/src/mouse.c b/source/mouse.c
similarity index 100%
rename from src/mouse.c
rename to source/mouse.c
diff --git a/src/mygetenv.c b/source/mygetenv.c
similarity index 100%
rename from src/mygetenv.c
rename to source/mygetenv.c
diff --git a/src/mypopen.c b/source/mypopen.c
similarity index 100%
rename from src/mypopen.c
rename to source/mypopen.c
diff --git a/src/opt.c b/source/opt.c
similarity index 100%
rename from src/opt.c
rename to source/opt.c
diff --git a/src/path.c b/source/path.c
similarity index 100%
rename from src/path.c
rename to source/path.c
diff --git a/src/readline.c b/source/readline.c
similarity index 100%
rename from src/readline.c
rename to source/readline.c
diff --git a/src/refsfound.c b/source/refsfound.c
similarity index 100%
rename from src/refsfound.c
rename to source/refsfound.c
diff --git a/src/scanner.h b/source/scanner.h
similarity index 100%
rename from src/scanner.h
rename to source/scanner.h
diff --git a/src/version.h b/source/version.h
similarity index 100%
rename from src/version.h
rename to source/version.h
diff --git a/src/vp.h b/source/vp.h
similarity index 100%
rename from src/vp.h
rename to source/vp.h
diff --git a/src/vpaccess.c b/source/vpaccess.c
similarity index 100%
rename from src/vpaccess.c
rename to source/vpaccess.c
diff --git a/src/vpfopen.c b/source/vpfopen.c
similarity index 100%
rename from src/vpfopen.c
rename to source/vpfopen.c
diff --git a/src/vpinit.c b/source/vpinit.c
similarity index 100%
rename from src/vpinit.c
rename to source/vpinit.c
diff --git a/src/vpopen.c b/source/vpopen.c
similarity index 100%
rename from src/vpopen.c
rename to source/vpopen.c