diff --git a/topics/grammars/bnf/Makefile b/topics/grammars/bnf/Makefile
deleted file mode 100644
index bf01af17..00000000
--- a/topics/grammars/bnf/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-tdir = ../../../shared/tools
-sdflib = ../../../../sdf-library/trunk/library/languages
-
-all:
-	make build
-	make test
-
-build:
-	${tdir}/sdf2bgf ${sdflib}/bnf/syntax/*.sdf bnf.sdf.bgf
-	${tdir}/sdf2bgf ${sdflib}/ebnf/syntax/*.sdf ebnf.sdf.bgf
-	${tdir}/sdf2bgf ${sdflib}/yacc/syntax/*.sdf yacc.sdf.bgf
-	${tdir}/xbgf ebnf.iso.generalize.xbgf ebnf.iso.informal.bgf ebnf.iso.informal.fix.bgf
-	${tdir}/xbgf bnf.sdf.correct.xbgf bnf.sdf.bgf _.bgf
-	${tdir}/subgrammar _.bgf Rules bnf.sdf.fix.bgf
-	${tdir}/xbgf correct.ebnf.xbgf ebnf.sdf.bgf _.bgf
-	${tdir}/subgrammar _.bgf Grammar ebnf.sdf.fix.bgf
-	${tdir}/xbgf refactor.yacc.xbgf yacc.sdf.bgf _.bgf
-	${tdir}/subgrammar _.bgf Grammar yacc.sdf.fix.bgf
-	rm -f _.bgf
-
-test:
-	ls -1 *.xbgf | xargs -n1 ${tdir}/validate xbgf
-	ls -1 *.bgf | xargs -n1 ${tdir}/validate bgf
-
-clean:
-	rm -f bnf.sdf.bgf ebnf.sdf.bgf bnf.sdf.fix.bgf ebnf.sdf.fix.bgf yacc.sdf.bgf yacc.sdf.fix.bgf _.bgf ebnf.iso.informal.fix.bgf
diff --git a/topics/grammars/c/Makefile b/topics/grammars/c/Makefile
index b635323c..922ac8ad 100644
--- a/topics/grammars/c/Makefile
+++ b/topics/grammars/c/Makefile
@@ -1,10 +1 @@
-extract:
-	cd iso-9899-1999 && make extract
-	cd iso-9899-tc2  && make extract
-	cd iso-9899-tc3  && make extract
-
-clean:
-	rm -f */*.bgf */*.html */*.bnf */intermediate.lll */tmp.xml
-
-test:
-	ls -1 */*.bgf | xargs -n1 ../../../shared/tools/validate bgf
+include ../Makefile.language
\ No newline at end of file
diff --git a/topics/grammars/c/iso-9899-1999/Makefile b/topics/grammars/c/iso-9899-1999/Makefile
index 5e524ec6..f69cb7bd 100644
--- a/topics/grammars/c/iso-9899-1999/Makefile
+++ b/topics/grammars/c/iso-9899-1999/Makefile
@@ -1,6 +1,6 @@
 extract:
-	${tooldir}/pdf2bgf src.language.syntax.summary.txt c.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf c.raw.bgf c.ext.bgf
-	${tooldir}/subgrammar c.ext.bgf translation-unit c.bgf
+	${tooldir}/pdf2bgf src.language.syntax.summary.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf ext.bgf
+	${tooldir}/subgrammar ext.bgf translation-unit grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/c/iso-9899-tc2/Makefile b/topics/grammars/c/iso-9899-tc2/Makefile
index 8710d2d9..7d223ab1 100644
--- a/topics/grammars/c/iso-9899-tc2/Makefile
+++ b/topics/grammars/c/iso-9899-tc2/Makefile
@@ -1,7 +1,7 @@
 extract:
-	${tooldir}/pdf2bgf src.language.syntax.summary.txt c.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf c.raw.bgf c.ext.bgf
-	${tooldir}/xbgf correct.xbgf c.ext.bgf c.ext.2.bgf
-	${tooldir}/subgrammar c.ext.2.bgf translation-unit c.bgf
+	${tooldir}/pdf2bgf src.language.syntax.summary.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf ext.bgf
+	${tooldir}/xbgf correct.xbgf ext.bgf ext.2.bgf
+	${tooldir}/subgrammar ext.2.bgf translation-unit grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/c/iso-9899-tc3/Makefile b/topics/grammars/c/iso-9899-tc3/Makefile
index 8710d2d9..7d223ab1 100644
--- a/topics/grammars/c/iso-9899-tc3/Makefile
+++ b/topics/grammars/c/iso-9899-tc3/Makefile
@@ -1,7 +1,7 @@
 extract:
-	${tooldir}/pdf2bgf src.language.syntax.summary.txt c.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf c.raw.bgf c.ext.bgf
-	${tooldir}/xbgf correct.xbgf c.ext.bgf c.ext.2.bgf
-	${tooldir}/subgrammar c.ext.2.bgf translation-unit c.bgf
+	${tooldir}/pdf2bgf src.language.syntax.summary.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf ext.bgf
+	${tooldir}/xbgf correct.xbgf ext.bgf ext.2.bgf
+	${tooldir}/subgrammar ext.2.bgf translation-unit grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/c/ready.lst b/topics/grammars/c/ready.lst
new file mode 100644
index 00000000..e460bfdb
--- /dev/null
+++ b/topics/grammars/c/ready.lst
@@ -0,0 +1,3 @@
+iso-9899-1999
+iso-9899-tc2
+iso-9899-tc3
diff --git a/topics/grammars/cpp/Makefile b/topics/grammars/cpp/Makefile
index fa4add1c..922ac8ad 100644
--- a/topics/grammars/cpp/Makefile
+++ b/topics/grammars/cpp/Makefile
@@ -1,9 +1 @@
-extract:
-	cd iso-14882-1998 && make extract
-	cd iso-n2723      && make extract
-
-clean:
-	rm -f */*.bgf */*.html */*.bnf */intermediate.lll */tmp.xml
-
-test:
-	ls -1 */*.bgf | xargs -n1 ../../../shared/tools/validate bgf
+include ../Makefile.language
\ No newline at end of file
diff --git a/topics/grammars/cpp/iso-14882-1998/Makefile b/topics/grammars/cpp/iso-14882-1998/Makefile
index 6cd2b416..e60af476 100644
--- a/topics/grammars/cpp/iso-14882-1998/Makefile
+++ b/topics/grammars/cpp/iso-14882-1998/Makefile
@@ -1,11 +1,11 @@
 extract:
-	${tooldir}/pdf2bgf src.grammar.summary.txt cpp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf cpp.raw.bgf cpp.ext.bgf
-	${tooldir}/xbgf correct.xbgf cpp.ext.bgf cpp.ext.2.bgf
-	${tooldir}/subgrammar cpp.ext.2.bgf translation-unit cpp.bgf
+	${tooldir}/pdf2bgf src.grammar.summary.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf ext.bgf
+	${tooldir}/xbgf correct.xbgf ext.bgf ext.2.bgf
+	${tooldir}/subgrammar ext.2.bgf translation-unit grammar.bgf
 
 diff:
-	../../hunter.py src.grammar.summary.txt config.edd cpp-1.bgf || exit -1
+	${hunter} src.grammar.summary.txt config.edd cpp-1.bgf || exit -1
 	#../../../../shared/tools/xbgf post-extract.xbgf ada-1.bgf ada-2.bgf
 	#../../../../shared/tools/xbgf correct.xbgf ada-2.bgf ada.bgf
 	#../../../../shared/tools/bgf2bnf ada.bgf ada.bnf
@@ -14,4 +14,4 @@ diff:
 toy:
 	../../hunter.py toy.prepared.txt config.edd toy.bgf || exit -1
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/cpp/iso-n2723/Makefile b/topics/grammars/cpp/iso-n2723/Makefile
index 63dbf830..37ec957b 100644
--- a/topics/grammars/cpp/iso-n2723/Makefile
+++ b/topics/grammars/cpp/iso-n2723/Makefile
@@ -2,9 +2,9 @@ extract:
 	grep -xv 'c ' src.grammar.summary.txt > src.prepared.txt
 	perl -pi -w -e 's/hand ler/handler/g;' src.prepared.txt
 	perl -pi -w -e 's/∼/~/g;' src.prepared.txt
-	${tooldir}/pdf2bgf src.prepared.txt cpp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf cpp.raw.bgf cpp.ext.bgf
-	${tooldir}/xbgf correct.xbgf cpp.ext.bgf cpp.ext.2.bgf
-	${tooldir}/subgrammar cpp.ext.2.bgf translation-unit cpp.bgf
+	${tooldir}/pdf2bgf src.prepared.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf ext.bgf
+	${tooldir}/xbgf correct.xbgf ext.bgf ext.2.bgf
+	${tooldir}/subgrammar ext.2.bgf translation-unit grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/cpp/ready.lst b/topics/grammars/cpp/ready.lst
new file mode 100644
index 00000000..563a7c48
--- /dev/null
+++ b/topics/grammars/cpp/ready.lst
@@ -0,0 +1,2 @@
+iso-14882-1998
+iso-n2723
diff --git a/topics/grammars/csharp/Makefile b/topics/grammars/csharp/Makefile
index 82205795..651fdd04 100644
--- a/topics/grammars/csharp/Makefile
+++ b/topics/grammars/csharp/Makefile
@@ -1,17 +1 @@
-extract:
-	cd ecma-334-1     && make extract
-	cd ecma-334-2     && make extract
-	cd ecma-334-3     && make extract
-	cd ecma-334-4     && make extract
-	cd iso-23270-2003 && make extract
-	cd iso-23270-2006 && make extract
-	cd msft-ls-1.0    && make extract
-	cd msft-ls-1.2    && make extract
-	cd msft-ls-3.0    && make extract
-	cd msft-ls-4.0    && make extract
-
-clean:
-	rm -f */*.bgf */*.html */*.bnf */intermediate.lll */tmp.xml
-
-test:
-	ls -1 */*.bgf | xargs -n1 ../../../shared/tools/validate bgf
+include ../Makefile.language
diff --git a/topics/grammars/csharp/ecma-334-1/Makefile b/topics/grammars/csharp/ecma-334-1/Makefile
index db52dae9..af0876ac 100644
--- a/topics/grammars/csharp/ecma-334-1/Makefile
+++ b/topics/grammars/csharp/ecma-334-1/Makefile
@@ -1,5 +1,5 @@
 extract:
-	${tooldir}/pdf2bgf src.grammar.txt csharp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf csharp.raw.bgf csharp.bgf
+	${tooldir}/pdf2bgf src.grammar.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/ecma-334-2/Makefile b/topics/grammars/csharp/ecma-334-2/Makefile
index db52dae9..af0876ac 100644
--- a/topics/grammars/csharp/ecma-334-2/Makefile
+++ b/topics/grammars/csharp/ecma-334-2/Makefile
@@ -1,5 +1,5 @@
 extract:
-	${tooldir}/pdf2bgf src.grammar.txt csharp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf csharp.raw.bgf csharp.bgf
+	${tooldir}/pdf2bgf src.grammar.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/ecma-334-3/Makefile b/topics/grammars/csharp/ecma-334-3/Makefile
index b56299b6..af0876ac 100644
--- a/topics/grammars/csharp/ecma-334-3/Makefile
+++ b/topics/grammars/csharp/ecma-334-3/Makefile
@@ -1,7 +1,5 @@
 extract:
-	${tooldir}/pdf2bgf src.grammar.txt csharp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/checkxml bgf csharp.raw.bgf
-	${tooldir}/normbgf csharp.raw.bgf csharp.bgf
-	${tooldir}/bgf2bnf csharp.bgf csharp.bnf
+	${tooldir}/pdf2bgf src.grammar.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/ecma-334-4/Makefile b/topics/grammars/csharp/ecma-334-4/Makefile
index ad470056..16742015 100644
--- a/topics/grammars/csharp/ecma-334-4/Makefile
+++ b/topics/grammars/csharp/ecma-334-4/Makefile
@@ -1,7 +1,7 @@
 extract:
-	${tooldir}/pdf2bgf src.grammar.txt csharp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf csharp.raw.bgf csharp.ext.bgf
-	${tooldir}/xbgf correct.xbgf csharp.ext.bgf csharp.ext.2.bgf
-	${tooldir}/subgrammar csharp.ext.2.bgf compilation-unit csharp.bgf
+	${tooldir}/pdf2bgf src.grammar.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf ext.bgf
+	${tooldir}/xbgf correct.xbgf ext.bgf rec.bgf
+	${tooldir}/subgrammar rec.bgf compilation-unit grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/iso-23270-2003/Makefile b/topics/grammars/csharp/iso-23270-2003/Makefile
index 39597865..9399fc84 100644
--- a/topics/grammars/csharp/iso-23270-2003/Makefile
+++ b/topics/grammars/csharp/iso-23270-2003/Makefile
@@ -1,7 +1,5 @@
 extract:
-	${tooldir}/lll2bgf ../../../recovery/csharp/CSHARP1.0.LLL csharp.raw.bgf
-	${tooldir}/normbgf csharp.raw.bgf csharp.ext.bgf
-	${tooldir}/lll2bgf ../../../recovery/csharp/grammars/Final.lll csharp.raw.2.bgf
-	${tooldir}/normbgf csharp.raw.2.bgf csharp.bgf
+	${tooldir}/lll2bgf ../../../recovery/csharp/CSHARP1.0.LLL raw.bgf
+	${tooldir}/normbgf raw.bgf grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/iso-23270-2006/Makefile b/topics/grammars/csharp/iso-23270-2006/Makefile
index db52dae9..af0876ac 100644
--- a/topics/grammars/csharp/iso-23270-2006/Makefile
+++ b/topics/grammars/csharp/iso-23270-2006/Makefile
@@ -1,5 +1,5 @@
 extract:
-	${tooldir}/pdf2bgf src.grammar.txt csharp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf csharp.raw.bgf csharp.bgf
+	${tooldir}/pdf2bgf src.grammar.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/msft-ls-1.0/Makefile b/topics/grammars/csharp/msft-ls-1.0/Makefile
index 9654981c..858c1ec4 100644
--- a/topics/grammars/csharp/msft-ls-1.0/Makefile
+++ b/topics/grammars/csharp/msft-ls-1.0/Makefile
@@ -1,6 +1,6 @@
 extract:
-	${tooldir}/pdf2bgf src.grammar.txt csharp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf csharp.raw.bgf csharp.ext.bgf
-	${tooldir}/subgrammar csharp.ext.bgf compilation-unit csharp.bgf
+	${tooldir}/pdf2bgf src.grammar.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf ext.bgf
+	${tooldir}/subgrammar ext.bgf compilation-unit grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/msft-ls-1.2/Makefile b/topics/grammars/csharp/msft-ls-1.2/Makefile
index 9654981c..858c1ec4 100644
--- a/topics/grammars/csharp/msft-ls-1.2/Makefile
+++ b/topics/grammars/csharp/msft-ls-1.2/Makefile
@@ -1,6 +1,6 @@
 extract:
-	${tooldir}/pdf2bgf src.grammar.txt csharp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf csharp.raw.bgf csharp.ext.bgf
-	${tooldir}/subgrammar csharp.ext.bgf compilation-unit csharp.bgf
+	${tooldir}/pdf2bgf src.grammar.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf ext.bgf
+	${tooldir}/subgrammar ext.bgf compilation-unit grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/msft-ls-3.0/Makefile b/topics/grammars/csharp/msft-ls-3.0/Makefile
index ad470056..e60b3bdf 100644
--- a/topics/grammars/csharp/msft-ls-3.0/Makefile
+++ b/topics/grammars/csharp/msft-ls-3.0/Makefile
@@ -1,7 +1,7 @@
 extract:
-	${tooldir}/pdf2bgf src.grammar.txt csharp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf csharp.raw.bgf csharp.ext.bgf
-	${tooldir}/xbgf correct.xbgf csharp.ext.bgf csharp.ext.2.bgf
-	${tooldir}/subgrammar csharp.ext.2.bgf compilation-unit csharp.bgf
+	${tooldir}/pdf2bgf src.grammar.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf ext.bgf
+	${tooldir}/xbgf correct.xbgf ext.bgf ext.2.bgf
+	${tooldir}/subgrammar ext.2.bgf compilation-unit grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/msft-ls-4.0/Makefile b/topics/grammars/csharp/msft-ls-4.0/Makefile
index ad470056..e60b3bdf 100644
--- a/topics/grammars/csharp/msft-ls-4.0/Makefile
+++ b/topics/grammars/csharp/msft-ls-4.0/Makefile
@@ -1,7 +1,7 @@
 extract:
-	${tooldir}/pdf2bgf src.grammar.txt csharp.raw.bgf banned-lines.lst keywords.lst
-	${tooldir}/normbgf csharp.raw.bgf csharp.ext.bgf
-	${tooldir}/xbgf correct.xbgf csharp.ext.bgf csharp.ext.2.bgf
-	${tooldir}/subgrammar csharp.ext.2.bgf compilation-unit csharp.bgf
+	${tooldir}/pdf2bgf src.grammar.txt raw.bgf banned-lines.lst keywords.lst
+	${tooldir}/normbgf raw.bgf ext.bgf
+	${tooldir}/xbgf correct.xbgf ext.bgf ext.2.bgf
+	${tooldir}/subgrammar ext.2.bgf compilation-unit grammar.bgf
 
-include ../../Makefile.include
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/zaytsev/Makefile b/topics/grammars/csharp/zaytsev/Makefile
new file mode 100644
index 00000000..29c3d0d4
--- /dev/null
+++ b/topics/grammars/csharp/zaytsev/Makefile
@@ -0,0 +1,5 @@
+extract:
+	${tooldir}/lll2bgf ../../../recovery/csharp/grammars/Final.lll raw.bgf
+	${tooldir}/normbgf raw.bgf grammar.bgf
+
+include ../../Makefile.grammar
diff --git a/topics/grammars/csharp/zaytsev/README.txt b/topics/grammars/csharp/zaytsev/README.txt
new file mode 100644
index 00000000..e61152f9
--- /dev/null
+++ b/topics/grammars/csharp/zaytsev/README.txt
@@ -0,0 +1,17 @@
+http://www.cs.vu.nl/grammarware/browsable/CSharp/
+http://grammarware.net/text/2005/toosharp.pdf
+http://grammarware.net/slides/2005/gttse.pdf
+
+@inproceedings{TooSharp2005,
+		author = "Vadim Zaytsev",
+		title = "{Correct C\# Grammar too Sharp for ISO}",
+		booktitle = "{Pre-proceedings of the International Summer School on Generative and Transformational Techniques in Software Engineering (GTTSE 2005), Part II, Participants Workshop}",
+		year = 2005,
+		pages = "154--155",
+		address = "Braga, Portugal",
+		month = "July",
+		publisher = "Technical Report, TR-CCTC/DI-36, Universidade do Minho",
+		note = "Extended abstract",
+		}
+
+
diff --git a/topics/grammars/fortran/Makefile b/topics/grammars/fortran/Makefile
index d80e2d3c..922ac8ad 100644
--- a/topics/grammars/fortran/Makefile
+++ b/topics/grammars/fortran/Makefile
@@ -1,8 +1 @@
-extract:
-	cd derricks && make extract
-
-clean:
-	cd derricks && make clean
-
-test:
-	cd derricks && make test
+include ../Makefile.language
\ No newline at end of file
diff --git a/topics/grammars/fortran/derricks/Makefile b/topics/grammars/fortran/derricks/Makefile
index fae0d5e8..62342fab 100644
--- a/topics/grammars/fortran/derricks/Makefile
+++ b/topics/grammars/fortran/derricks/Makefile
@@ -1,7 +1,6 @@
 extract:
-	${tooldir}/sdf2bgf ${sdflibdir}/fortran/syntax/*.sdf fortran.sdf.ext.bgf
-	${tooldir}/subgrammar fortran.sdf.ext.bgf ExecutableProgram fortran.tmp.bgf
-	${tooldir}/xbgf refactor.xbgf fortran.tmp.bgf fortran.sdf.rec.bgf
-	cp fortran.sdf.rec.bgf fortran.bgf
+	${tooldir}/sdf2bgf ${sdflibdir}/fortran/syntax/*.sdf raw.bgf
+	${tooldir}/subgrammar raw.bgf ExecutableProgram ext.bgf
+	${tooldir}/xbgf refactor.xbgf ext.bgf grammar.bgf
 
-include ../../Makefile.include
\ No newline at end of file
+include ../../Makefile.grammar
\ No newline at end of file
diff --git a/topics/grammars/fortran/ready.lst b/topics/grammars/fortran/ready.lst
new file mode 100644
index 00000000..2ad1d6f6
--- /dev/null
+++ b/topics/grammars/fortran/ready.lst
@@ -0,0 +1 @@
+derricks
diff --git a/topics/grammars/java-1/Makefile b/topics/grammars/java-1/Makefile
new file mode 100644
index 00000000..922ac8ad
--- /dev/null
+++ b/topics/grammars/java-1/Makefile
@@ -0,0 +1 @@
+include ../Makefile.language
\ No newline at end of file
diff --git a/topics/grammars/java/jls1/Makefile b/topics/grammars/java-1/jls1/Makefile
similarity index 100%
rename from topics/grammars/java/jls1/Makefile
rename to topics/grammars/java-1/jls1/Makefile
diff --git a/topics/grammars/java/jls1/README.txt b/topics/grammars/java-1/jls1/README.txt
similarity index 100%
rename from topics/grammars/java/jls1/README.txt
rename to topics/grammars/java-1/jls1/README.txt
diff --git a/topics/grammars/java/jls1/collect.kw b/topics/grammars/java-1/jls1/collect.kw
similarity index 100%
rename from topics/grammars/java/jls1/collect.kw
rename to topics/grammars/java-1/jls1/collect.kw
diff --git a/topics/grammars/java/jls1/extracted-implementable-grammar.bgf b/topics/grammars/java-1/jls1/extracted-implementable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls1/extracted-implementable-grammar.bgf
rename to topics/grammars/java-1/jls1/extracted-implementable-grammar.bgf
diff --git a/topics/grammars/java/jls1/extracted-readable-grammar.bgf b/topics/grammars/java-1/jls1/extracted-readable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls1/extracted-readable-grammar.bgf
rename to topics/grammars/java-1/jls1/extracted-readable-grammar.bgf
diff --git a/topics/grammars/java/jls1/impl.html b/topics/grammars/java-1/jls1/impl.html
similarity index 100%
rename from topics/grammars/java/jls1/impl.html
rename to topics/grammars/java-1/jls1/impl.html
diff --git a/topics/grammars/java/jls1/read.html b/topics/grammars/java-1/jls1/read.html
similarity index 100%
rename from topics/grammars/java/jls1/read.html
rename to topics/grammars/java-1/jls1/read.html
diff --git a/topics/grammars/java/jls1/recovered-implementable-grammar.bgf b/topics/grammars/java-1/jls1/recovered-implementable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls1/recovered-implementable-grammar.bgf
rename to topics/grammars/java-1/jls1/recovered-implementable-grammar.bgf
diff --git a/topics/grammars/java/jls1/recovered-readable-grammar.bgf b/topics/grammars/java-1/jls1/recovered-readable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls1/recovered-readable-grammar.bgf
rename to topics/grammars/java-1/jls1/recovered-readable-grammar.bgf
diff --git a/topics/grammars/java/jls1/syntax.kw b/topics/grammars/java-1/jls1/syntax.kw
similarity index 100%
rename from topics/grammars/java/jls1/syntax.kw
rename to topics/grammars/java-1/jls1/syntax.kw
diff --git a/topics/grammars/java-1/ready.lst b/topics/grammars/java-1/ready.lst
new file mode 100644
index 00000000..48413e0d
--- /dev/null
+++ b/topics/grammars/java-1/ready.lst
@@ -0,0 +1 @@
+jls1
diff --git a/topics/grammars/java-2/Makefile b/topics/grammars/java-2/Makefile
new file mode 100644
index 00000000..922ac8ad
--- /dev/null
+++ b/topics/grammars/java-2/Makefile
@@ -0,0 +1 @@
+include ../Makefile.language
\ No newline at end of file
diff --git a/topics/grammars/java/jls2/Makefile b/topics/grammars/java-2/jls2/Makefile
similarity index 100%
rename from topics/grammars/java/jls2/Makefile
rename to topics/grammars/java-2/jls2/Makefile
diff --git a/topics/grammars/java/jls2/README.txt b/topics/grammars/java-2/jls2/README.txt
similarity index 100%
rename from topics/grammars/java/jls2/README.txt
rename to topics/grammars/java-2/jls2/README.txt
diff --git a/topics/grammars/java/jls2/collect.kw b/topics/grammars/java-2/jls2/collect.kw
similarity index 100%
rename from topics/grammars/java/jls2/collect.kw
rename to topics/grammars/java-2/jls2/collect.kw
diff --git a/topics/grammars/java/jls2/extracted-implementable-grammar.bgf b/topics/grammars/java-2/jls2/extracted-implementable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls2/extracted-implementable-grammar.bgf
rename to topics/grammars/java-2/jls2/extracted-implementable-grammar.bgf
diff --git a/topics/grammars/java/jls2/extracted-readable-grammar.bgf b/topics/grammars/java-2/jls2/extracted-readable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls2/extracted-readable-grammar.bgf
rename to topics/grammars/java-2/jls2/extracted-readable-grammar.bgf
diff --git a/topics/grammars/java/jls2/impl.html b/topics/grammars/java-2/jls2/impl.html
similarity index 100%
rename from topics/grammars/java/jls2/impl.html
rename to topics/grammars/java-2/jls2/impl.html
diff --git a/topics/grammars/java/jls2/read.html b/topics/grammars/java-2/jls2/read.html
similarity index 100%
rename from topics/grammars/java/jls2/read.html
rename to topics/grammars/java-2/jls2/read.html
diff --git a/topics/grammars/java/jls2/recovered-implementable-grammar.bgf b/topics/grammars/java-2/jls2/recovered-implementable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls2/recovered-implementable-grammar.bgf
rename to topics/grammars/java-2/jls2/recovered-implementable-grammar.bgf
diff --git a/topics/grammars/java/jls2/recovered-readable-grammar.bgf b/topics/grammars/java-2/jls2/recovered-readable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls2/recovered-readable-grammar.bgf
rename to topics/grammars/java-2/jls2/recovered-readable-grammar.bgf
diff --git a/topics/grammars/java-2/ready.lst b/topics/grammars/java-2/ready.lst
new file mode 100644
index 00000000..6983ecc4
--- /dev/null
+++ b/topics/grammars/java-2/ready.lst
@@ -0,0 +1 @@
+jls2
diff --git a/topics/grammars/java/antlr-java-1.3/Main.java b/topics/grammars/java-3/parr/Main.java
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/Main.java
rename to topics/grammars/java-3/parr/Main.java
diff --git a/topics/grammars/java/antlr-java-1.3/README.txt b/topics/grammars/java-3/parr/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/README.txt
rename to topics/grammars/java-3/parr/README.txt
diff --git a/topics/grammars/java/antlr-java-1.3/java.g b/topics/grammars/java-3/parr/java.g
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/java.g
rename to topics/grammars/java-3/parr/java.g
diff --git a/topics/grammars/java/antlr-java-1.3/java.tree.g b/topics/grammars/java-3/parr/java.tree.g
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/java.tree.g
rename to topics/grammars/java-3/parr/java.tree.g
diff --git a/topics/grammars/java/antlr-java-1.3/shiplist b/topics/grammars/java-3/parr/shiplist
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/shiplist
rename to topics/grammars/java-3/parr/shiplist
diff --git a/topics/grammars/java/antlr-java-1.3/tests/A.java b/topics/grammars/java-3/parr/tests/A.java
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/tests/A.java
rename to topics/grammars/java-3/parr/tests/A.java
diff --git a/topics/grammars/java/antlr-java-1.3/tests/B.java b/topics/grammars/java-3/parr/tests/B.java
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/tests/B.java
rename to topics/grammars/java-3/parr/tests/B.java
diff --git a/topics/grammars/java/antlr-java-1.3/tests/C.java b/topics/grammars/java-3/parr/tests/C.java
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/tests/C.java
rename to topics/grammars/java-3/parr/tests/C.java
diff --git a/topics/grammars/java/antlr-java-1.3/tests/D.java b/topics/grammars/java-3/parr/tests/D.java
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/tests/D.java
rename to topics/grammars/java-3/parr/tests/D.java
diff --git a/topics/grammars/java/antlr-java-1.3/tests/E.java b/topics/grammars/java-3/parr/tests/E.java
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/tests/E.java
rename to topics/grammars/java-3/parr/tests/E.java
diff --git a/topics/grammars/java/antlr-java-1.3/tests/T.java b/topics/grammars/java-3/parr/tests/T.java
similarity index 100%
rename from topics/grammars/java/antlr-java-1.3/tests/T.java
rename to topics/grammars/java-3/parr/tests/T.java
diff --git a/topics/grammars/java-4/Makefile b/topics/grammars/java-4/Makefile
new file mode 100644
index 00000000..922ac8ad
--- /dev/null
+++ b/topics/grammars/java-4/Makefile
@@ -0,0 +1 @@
+include ../Makefile.language
\ No newline at end of file
diff --git a/topics/grammars/java/antlr-java-1.4/README.txt b/topics/grammars/java-4/parr/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-1.4/README.txt
rename to topics/grammars/java-4/parr/README.txt
diff --git a/topics/grammars/java/antlr-java-1.4/javaG.g b/topics/grammars/java-4/parr/javaG.g
similarity index 100%
rename from topics/grammars/java/antlr-java-1.4/javaG.g
rename to topics/grammars/java-4/parr/javaG.g
diff --git a/topics/grammars/java-4/ready.lst b/topics/grammars/java-4/ready.lst
new file mode 100644
index 00000000..2f4e349d
--- /dev/null
+++ b/topics/grammars/java-4/ready.lst
@@ -0,0 +1 @@
+sdf
diff --git a/topics/grammars/java-4/sdf/Makefile b/topics/grammars/java-4/sdf/Makefile
new file mode 100644
index 00000000..0e2f8348
--- /dev/null
+++ b/topics/grammars/java-4/sdf/Makefile
@@ -0,0 +1,5 @@
+extract:
+	${tooldir}/sdf2bgf ${sdflibdir}/java/syntax/*.sdf ext.bgf
+	${tooldir}/subgrammar ext.bgf Top-sort grammar.bgf
+
+include ../../Makefile.grammar
diff --git a/topics/grammars/java-5/Makefile b/topics/grammars/java-5/Makefile
new file mode 100644
index 00000000..525932ff
--- /dev/null
+++ b/topics/grammars/java-5/Makefile
@@ -0,0 +1,5 @@
+build:
+	cd ../../extraction/antlr && make build
+	make extract
+
+include ../Makefile.language
diff --git a/topics/grammars/java/antlr-java-5/burn/Makefile b/topics/grammars/java-5/burn/Makefile
similarity index 100%
rename from topics/grammars/java/antlr-java-5/burn/Makefile
rename to topics/grammars/java-5/burn/Makefile
diff --git a/topics/grammars/java/antlr-java-5/burn/README.txt b/topics/grammars/java-5/burn/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-5/burn/README.txt
rename to topics/grammars/java-5/burn/README.txt
diff --git a/topics/grammars/java/antlr-java-5/burn/java.g b/topics/grammars/java-5/burn/java.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/burn/java.g
rename to topics/grammars/java-5/burn/java.g
diff --git a/topics/grammars/java/antlr-java-5/colombi/JavaPreProcessorReader.java b/topics/grammars/java-5/colombi/JavaPreProcessorReader.java
similarity index 100%
rename from topics/grammars/java/antlr-java-5/colombi/JavaPreProcessorReader.java
rename to topics/grammars/java-5/colombi/JavaPreProcessorReader.java
diff --git a/topics/grammars/java/antlr-java-5/colombi/Makefile b/topics/grammars/java-5/colombi/Makefile
similarity index 100%
rename from topics/grammars/java/antlr-java-5/colombi/Makefile
rename to topics/grammars/java-5/colombi/Makefile
diff --git a/topics/grammars/java/antlr-java-5/colombi/README.txt b/topics/grammars/java-5/colombi/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-5/colombi/README.txt
rename to topics/grammars/java-5/colombi/README.txt
diff --git a/topics/grammars/java/antlr-java-5/colombi/java1.5.g b/topics/grammars/java-5/colombi/java1.5.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/colombi/java1.5.g
rename to topics/grammars/java-5/colombi/java1.5.g
diff --git a/topics/grammars/java/antlr-java-5/habelitz/Java.g b/topics/grammars/java-5/habelitz/Java.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/habelitz/Java.g
rename to topics/grammars/java-5/habelitz/Java.g
diff --git a/topics/grammars/java/antlr-java-5/habelitz/Java.rsc.g b/topics/grammars/java-5/habelitz/Java.rsc.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/habelitz/Java.rsc.g
rename to topics/grammars/java-5/habelitz/Java.rsc.g
diff --git a/topics/grammars/java/antlr-java-5/habelitz/JavaTreeParser.g b/topics/grammars/java-5/habelitz/JavaTreeParser.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/habelitz/JavaTreeParser.g
rename to topics/grammars/java-5/habelitz/JavaTreeParser.g
diff --git a/topics/grammars/java-5/habelitz/Makefile b/topics/grammars/java-5/habelitz/Makefile
new file mode 100644
index 00000000..6d339008
--- /dev/null
+++ b/topics/grammars/java-5/habelitz/Makefile
@@ -0,0 +1,21 @@
+all:
+	make build
+	make run
+
+extract:
+	../../../extraction/antlr/antlrpp.py Java.rsc.g Java.pp.g
+	java -cp ${CLASSPATH}:../../../../download/antlrworks-1.1.7.jar:../../../extraction/antlr slps.antlr2bgf.Tool Java.pp.g habelitz.ext.bgf
+	../../../../shared/tools/xbgf post-extraction.xbgf habelitz.ext.bgf habelitz.fix.bgf
+	../../../../shared/tools/subgrammar habelitz.fix.bgf javaSource grammar.bgf
+
+build:
+	java -cp ../../../../download/antlr-3.2.jar org.antlr.Tool Java.g JavaTreeParser.g
+	mv Java*.java com/habelitz/jsobjectizer/unmarshaller/antlrbridge/generated
+	javac -cp ../../../../download/antlr-3.2.jar *.java com/habelitz/jsobjectizer/unmarshaller/antlrbridge/generated/*.java
+	jar cf habelitz.jar *.class com/habelitz/jsobjectizer/unmarshaller/antlrbridge/generated/*.class
+
+run:
+	java -cp $$CLASSPATH:../../../../download/antlr-3.2.jar:habelitz.jar -ea TestIO TestIO.java
+
+clean:
+	rm -f *.tokens Java*.java *.class com/habelitz/jsobjectizer/unmarshaller/antlrbridge/generated/* *.jar Java.pp.g *.bgf
diff --git a/topics/grammars/java/antlr-java-5/habelitz/README.txt b/topics/grammars/java-5/habelitz/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-5/habelitz/README.txt
rename to topics/grammars/java-5/habelitz/README.txt
diff --git a/topics/grammars/java/antlr-java-5/habelitz/TestIO.java b/topics/grammars/java-5/habelitz/TestIO.java
similarity index 100%
rename from topics/grammars/java/antlr-java-5/habelitz/TestIO.java
rename to topics/grammars/java-5/habelitz/TestIO.java
diff --git a/topics/grammars/java/antlr-java-5/habelitz/_Readme.txt b/topics/grammars/java-5/habelitz/_Readme.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-5/habelitz/_Readme.txt
rename to topics/grammars/java-5/habelitz/_Readme.txt
diff --git a/topics/grammars/java/antlr-java-5/habelitz/post-extraction.xbgf b/topics/grammars/java-5/habelitz/post-extraction.xbgf
similarity index 100%
rename from topics/grammars/java/antlr-java-5/habelitz/post-extraction.xbgf
rename to topics/grammars/java-5/habelitz/post-extraction.xbgf
diff --git a/topics/grammars/java/jls3/Makefile b/topics/grammars/java-5/jls3/Makefile
similarity index 100%
rename from topics/grammars/java/jls3/Makefile
rename to topics/grammars/java-5/jls3/Makefile
diff --git a/topics/grammars/java/jls3/README.txt b/topics/grammars/java-5/jls3/README.txt
similarity index 100%
rename from topics/grammars/java/jls3/README.txt
rename to topics/grammars/java-5/jls3/README.txt
diff --git a/topics/grammars/java/jls3/collect.kw b/topics/grammars/java-5/jls3/collect.kw
similarity index 100%
rename from topics/grammars/java/jls3/collect.kw
rename to topics/grammars/java-5/jls3/collect.kw
diff --git a/topics/grammars/java/jls3/extracted-implementable-grammar.bgf b/topics/grammars/java-5/jls3/extracted-implementable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls3/extracted-implementable-grammar.bgf
rename to topics/grammars/java-5/jls3/extracted-implementable-grammar.bgf
diff --git a/topics/grammars/java/jls3/extracted-readable-grammar.bgf b/topics/grammars/java-5/jls3/extracted-readable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls3/extracted-readable-grammar.bgf
rename to topics/grammars/java-5/jls3/extracted-readable-grammar.bgf
diff --git a/topics/grammars/java/jls3/impl.html b/topics/grammars/java-5/jls3/impl.html
similarity index 100%
rename from topics/grammars/java/jls3/impl.html
rename to topics/grammars/java-5/jls3/impl.html
diff --git a/topics/grammars/java/jls3/read.html b/topics/grammars/java-5/jls3/read.html
similarity index 100%
rename from topics/grammars/java/jls3/read.html
rename to topics/grammars/java-5/jls3/read.html
diff --git a/topics/grammars/java/jls3/recovered-implementable-grammar.bgf b/topics/grammars/java-5/jls3/recovered-implementable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls3/recovered-implementable-grammar.bgf
rename to topics/grammars/java-5/jls3/recovered-implementable-grammar.bgf
diff --git a/topics/grammars/java/jls3/recovered-readable-grammar.bgf b/topics/grammars/java-5/jls3/recovered-readable-grammar.bgf
similarity index 100%
rename from topics/grammars/java/jls3/recovered-readable-grammar.bgf
rename to topics/grammars/java-5/jls3/recovered-readable-grammar.bgf
diff --git a/topics/grammars/java/antlr-java-5/parr/Java.g b/topics/grammars/java-5/parr/Java.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/parr/Java.g
rename to topics/grammars/java-5/parr/Java.g
diff --git a/topics/grammars/java/antlr-java-5/parr/Java.rsc.g b/topics/grammars/java-5/parr/Java.rsc.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/parr/Java.rsc.g
rename to topics/grammars/java-5/parr/Java.rsc.g
diff --git a/topics/grammars/java-5/parr/Makefile b/topics/grammars/java-5/parr/Makefile
new file mode 100644
index 00000000..4d717a57
--- /dev/null
+++ b/topics/grammars/java-5/parr/Makefile
@@ -0,0 +1,20 @@
+all:
+	make build
+	make run
+
+extract:
+	../../../extraction/antlr/antlrpp.py Java.rsc.g Java.pp.g
+	java -cp ${CLASSPATH}:../../../../download/antlrworks-1.1.7.jar:../../../extraction/antlr slps.antlr2bgf.Tool Java.pp.g parr.ext.bgf
+	../../../../shared/tools/xbgf post-extraction.xbgf parr.ext.bgf parr.fix.bgf
+	../../../../shared/tools/subgrammar parr.fix.bgf compilationUnit grammar.bgf
+
+build:
+	java -Xmx100M -cp ../../../../download/antlr-3.2.jar org.antlr.Tool Java.g
+	javac -cp ../../../../download/antlr-3.2.jar *.java
+	jar cf parr.jar *.class
+
+run:
+	java -cp $$CLASSPATH:../../../../download/antlr-3.2.jar:parr.jar -ea TestIO TestIO.java
+
+clean:
+	rm Java.tokens Java*.java *.class *.jar
diff --git a/topics/grammars/java/antlr-java-5/parr/README.txt b/topics/grammars/java-5/parr/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-5/parr/README.txt
rename to topics/grammars/java-5/parr/README.txt
diff --git a/topics/grammars/java/antlr-java-5/parr/TestIO.java b/topics/grammars/java-5/parr/TestIO.java
similarity index 100%
rename from topics/grammars/java/antlr-java-5/parr/TestIO.java
rename to topics/grammars/java-5/parr/TestIO.java
diff --git a/topics/grammars/java/antlr-java-5/parr/post-extraction.xbgf b/topics/grammars/java-5/parr/post-extraction.xbgf
similarity index 100%
rename from topics/grammars/java/antlr-java-5/parr/post-extraction.xbgf
rename to topics/grammars/java-5/parr/post-extraction.xbgf
diff --git a/topics/grammars/java-5/ready.lst b/topics/grammars/java-5/ready.lst
new file mode 100644
index 00000000..6ef417fb
--- /dev/null
+++ b/topics/grammars/java-5/ready.lst
@@ -0,0 +1,4 @@
+habelitz
+parr
+stahl
+studman
\ No newline at end of file
diff --git a/topics/grammars/java-5/stahl/Makefile b/topics/grammars/java-5/stahl/Makefile
new file mode 100644
index 00000000..8b0c7743
--- /dev/null
+++ b/topics/grammars/java-5/stahl/Makefile
@@ -0,0 +1,19 @@
+all:
+	make build
+	make run
+
+extract:
+	../../../extraction/antlr/antlrpp.py java.rsc.g java.pp.g
+	java -cp ${CLASSPATH}:../../../../download/antlrworks-1.1.7.jar:../../../extraction/antlr slps.antlr2bgf.Tool java.pp.g stahl.ext.bgf
+	../../../../shared/tools/xbgf post-extraction.xbgf stahl.ext.bgf stahl.fix.bgf
+	../../../../shared/tools/subgrammar stahl.fix.bgf compilationUnit grammar.bgf
+
+build:
+	java -cp ../../../../download/antlr-3.2.jar antlr.Tool java.g java.tree.g
+	javac -cp $$CLASSPATH:../../../../download/antlr-3.2.jar TestIO.java
+
+run:
+	java -cp $$CLASSPATH:../../../../download/antlr-3.2.jar TestIO TestIO.java
+
+clean:
+	rm -f Java*.java *.class JavaTokenTypes.txt *.smap
diff --git a/topics/grammars/java/antlr-java-5/stahl/README.txt b/topics/grammars/java-5/stahl/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-5/stahl/README.txt
rename to topics/grammars/java-5/stahl/README.txt
diff --git a/topics/grammars/java/antlr-java-5/stahl/Stahl.README b/topics/grammars/java-5/stahl/Stahl.README
similarity index 100%
rename from topics/grammars/java/antlr-java-5/stahl/Stahl.README
rename to topics/grammars/java-5/stahl/Stahl.README
diff --git a/topics/grammars/java/antlr-java-5/stahl/TestIO.java b/topics/grammars/java-5/stahl/TestIO.java
similarity index 100%
rename from topics/grammars/java/antlr-java-5/stahl/TestIO.java
rename to topics/grammars/java-5/stahl/TestIO.java
diff --git a/topics/grammars/java/antlr-java-5/stahl/java.g b/topics/grammars/java-5/stahl/java.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/stahl/java.g
rename to topics/grammars/java-5/stahl/java.g
diff --git a/topics/grammars/java/antlr-java-5/stahl/java.rsc.g b/topics/grammars/java-5/stahl/java.rsc.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/stahl/java.rsc.g
rename to topics/grammars/java-5/stahl/java.rsc.g
diff --git a/topics/grammars/java/antlr-java-5/stahl/java.tree.g b/topics/grammars/java-5/stahl/java.tree.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/stahl/java.tree.g
rename to topics/grammars/java-5/stahl/java.tree.g
diff --git a/topics/grammars/java/antlr-java-5/stahl/post-extraction.xbgf b/topics/grammars/java-5/stahl/post-extraction.xbgf
similarity index 100%
rename from topics/grammars/java/antlr-java-5/stahl/post-extraction.xbgf
rename to topics/grammars/java-5/stahl/post-extraction.xbgf
diff --git a/topics/grammars/java-5/studman/Makefile b/topics/grammars/java-5/studman/Makefile
new file mode 100644
index 00000000..ef072c1a
--- /dev/null
+++ b/topics/grammars/java-5/studman/Makefile
@@ -0,0 +1,19 @@
+all:
+	make build
+	make run
+
+extract:
+	../../../extraction/antlr/antlrpp.py java15.rsc.g java15.pp.g
+	java -cp ${CLASSPATH}:../../../../download/antlrworks-1.1.7.jar:../../../extraction/antlr slps.antlr2bgf.Tool java15.pp.g studman.ext.bgf
+	../../../../shared/tools/xbgf post-extraction.xbgf studman.ext.bgf studman.fix.bgf
+	../../../../shared/tools/subgrammar studman.fix.bgf compilationUnit grammar.bgf
+
+build:
+	java -cp ../../../../download/antlr-3.2.jar antlr.Tool java15.g java15.tree.g
+	javac -cp $$CLASSPATH:../../../../download/antlr-3.2.jar TestIO.java
+
+run:
+	java -cp $$CLASSPATH:../../../../download/antlr-3.2.jar TestIO TestIO.java
+
+clean:
+	rm -f Java*.java *.class JavaTokenTypes.txt *.smap
diff --git a/topics/grammars/java/antlr-java-5/studman/README.txt b/topics/grammars/java-5/studman/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-5/studman/README.txt
rename to topics/grammars/java-5/studman/README.txt
diff --git a/topics/grammars/java/antlr-java-5/studman/TestIO.java b/topics/grammars/java-5/studman/TestIO.java
similarity index 100%
rename from topics/grammars/java/antlr-java-5/studman/TestIO.java
rename to topics/grammars/java-5/studman/TestIO.java
diff --git a/topics/grammars/java/antlr-java-5/studman/java15.g b/topics/grammars/java-5/studman/java15.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/studman/java15.g
rename to topics/grammars/java-5/studman/java15.g
diff --git a/topics/grammars/java/antlr-java-5/studman/java15.rsc.g b/topics/grammars/java-5/studman/java15.rsc.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/studman/java15.rsc.g
rename to topics/grammars/java-5/studman/java15.rsc.g
diff --git a/topics/grammars/java/antlr-java-5/studman/java15.tree.g b/topics/grammars/java-5/studman/java15.tree.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/studman/java15.tree.g
rename to topics/grammars/java-5/studman/java15.tree.g
diff --git a/topics/grammars/java/antlr-java-5/studman/post-extraction.xbgf b/topics/grammars/java-5/studman/post-extraction.xbgf
similarity index 100%
rename from topics/grammars/java/antlr-java-5/studman/post-extraction.xbgf
rename to topics/grammars/java-5/studman/post-extraction.xbgf
diff --git a/topics/grammars/java/antlr-java-5/wiersma/Makefile b/topics/grammars/java-5/wiersma/Makefile
similarity index 100%
rename from topics/grammars/java/antlr-java-5/wiersma/Makefile
rename to topics/grammars/java-5/wiersma/Makefile
diff --git a/topics/grammars/java/antlr-java-5/wiersma/README.txt b/topics/grammars/java-5/wiersma/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-5/wiersma/README.txt
rename to topics/grammars/java-5/wiersma/README.txt
diff --git a/topics/grammars/java/antlr-java-5/wiersma/java.g b/topics/grammars/java-5/wiersma/java.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/wiersma/java.g
rename to topics/grammars/java-5/wiersma/java.g
diff --git a/topics/grammars/java/antlr-java-5/wisniewski/JavaPreProcessor.cs b/topics/grammars/java-5/wisniewski/JavaPreProcessor.cs
similarity index 100%
rename from topics/grammars/java/antlr-java-5/wisniewski/JavaPreProcessor.cs
rename to topics/grammars/java-5/wisniewski/JavaPreProcessor.cs
diff --git a/topics/grammars/java/antlr-java-5/wisniewski/Makefile b/topics/grammars/java-5/wisniewski/Makefile
similarity index 100%
rename from topics/grammars/java/antlr-java-5/wisniewski/Makefile
rename to topics/grammars/java-5/wisniewski/Makefile
diff --git a/topics/grammars/java/antlr-java-5/wisniewski/README.txt b/topics/grammars/java-5/wisniewski/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-5/wisniewski/README.txt
rename to topics/grammars/java-5/wisniewski/README.txt
diff --git a/topics/grammars/java/antlr-java-5/wisniewski/java1.5.g b/topics/grammars/java-5/wisniewski/java1.5.g
similarity index 100%
rename from topics/grammars/java/antlr-java-5/wisniewski/java1.5.g
rename to topics/grammars/java-5/wisniewski/java1.5.g
diff --git a/topics/grammars/java/antlr-java-6/Java.g b/topics/grammars/java-6/jiang/Java.g
similarity index 100%
rename from topics/grammars/java/antlr-java-6/Java.g
rename to topics/grammars/java-6/jiang/Java.g
diff --git a/topics/grammars/java/antlr-java-6/README.txt b/topics/grammars/java-6/jiang/README.txt
similarity index 100%
rename from topics/grammars/java/antlr-java-6/README.txt
rename to topics/grammars/java-6/jiang/README.txt
diff --git a/topics/grammars/java/antlr-java-5/Makefile b/topics/grammars/java/antlr-java-5/Makefile
deleted file mode 100644
index 487e1eef..00000000
--- a/topics/grammars/java/antlr-java-5/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-all:
-	cd ../../../extraction/antlr && make build
-	make extract
-
-extract:
-	cd habelitz && make extract
-	cd parr && make extract
-	cd stahl && make extract
-	cd studman && make extract
-
-test:
-	ls -1 *.bgf */*.bgf | xargs -n1 ../../../../shared/tools/validate bgf
-
-clean:
-	rm *.bgf
diff --git a/topics/grammars/java/antlr-java-5/habelitz/Makefile b/topics/grammars/java/antlr-java-5/habelitz/Makefile
deleted file mode 100644
index c62856d6..00000000
--- a/topics/grammars/java/antlr-java-5/habelitz/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-all:
-	make build
-	make run
-
-extract:
-	../../../../extraction/antlr/antlrpp.py Java.rsc.g Java.pp.g
-	java -cp ${CLASSPATH}:../../../../../download/antlrworks-1.1.7.jar:../../../../extraction/antlr slps.antlr2bgf.Tool Java.pp.g habelitz.ext.bgf
-	../../../../../shared/tools/xbgf post-extraction.xbgf habelitz.ext.bgf habelitz.fix.bgf
-	../../../../../shared/tools/subgrammar habelitz.fix.bgf javaSource habelitz.bgf
-
-build:
-	java -cp ../../../../../download/antlr-3.2.jar org.antlr.Tool Java.g JavaTreeParser.g
-	mv Java*.java com/habelitz/jsobjectizer/unmarshaller/antlrbridge/generated
-	javac -cp ../../../../../download/antlr-3.2.jar *.java com/habelitz/jsobjectizer/unmarshaller/antlrbridge/generated/*.java
-	jar cf habelitz.jar *.class com/habelitz/jsobjectizer/unmarshaller/antlrbridge/generated/*.class
-
-run:
-	java -cp $$CLASSPATH:../../../../../download/antlr-3.2.jar:habelitz.jar -ea TestIO TestIO.java
-
-clean:
-	rm -f *.tokens Java*.java *.class com/habelitz/jsobjectizer/unmarshaller/antlrbridge/generated/* *.jar Java.pp.g *.bgf
diff --git a/topics/grammars/java/antlr-java-5/parr/Makefile b/topics/grammars/java/antlr-java-5/parr/Makefile
deleted file mode 100644
index d98a9114..00000000
--- a/topics/grammars/java/antlr-java-5/parr/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-all:
-	make build
-	make run
-
-extract:
-	../../../../extraction/antlr/antlrpp.py Java.rsc.g Java.pp.g
-	java -cp ${CLASSPATH}:../../../../../download/antlrworks-1.1.7.jar:../../../../extraction/antlr slps.antlr2bgf.Tool Java.pp.g parr.ext.bgf
-	../../../../../shared/tools/xbgf post-extraction.xbgf parr.ext.bgf parr.fix.bgf
-	../../../../../shared/tools/subgrammar parr.fix.bgf compilationUnit parr.bgf
-
-build:
-	java -Xmx100M -cp ../../../../../download/antlr-3.2.jar org.antlr.Tool Java.g
-	javac -cp ../../../../../download/antlr-3.2.jar *.java
-	jar cf parr.jar *.class
-
-run:
-	java -cp $$CLASSPATH:../../../../../download/antlr-3.2.jar:parr.jar -ea TestIO TestIO.java
-
-clean:
-	rm Java.tokens Java*.java *.class *.jar
diff --git a/topics/grammars/java/antlr-java-5/stahl/Makefile b/topics/grammars/java/antlr-java-5/stahl/Makefile
deleted file mode 100644
index c3abbd95..00000000
--- a/topics/grammars/java/antlr-java-5/stahl/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-all:
-	make build
-	make run
-
-extract:
-	../../../../extraction/antlr/antlrpp.py java.rsc.g java.pp.g
-	java -cp ${CLASSPATH}:../../../../../download/antlrworks-1.1.7.jar:../../../../extraction/antlr slps.antlr2bgf.Tool java.pp.g stahl.ext.bgf
-	../../../../../shared/tools/xbgf post-extraction.xbgf stahl.ext.bgf stahl.fix.bgf
-	../../../../../shared/tools/subgrammar stahl.fix.bgf compilationUnit stahl.bgf
-
-build:
-	java -cp ../../../../../download/antlr-3.2.jar antlr.Tool java.g java.tree.g
-	javac -cp $$CLASSPATH:../../../../../download/antlr-3.2.jar TestIO.java
-
-run:
-	java -cp $$CLASSPATH:../../../../../download/antlr-3.2.jar TestIO TestIO.java
-
-clean:
-	rm -f Java*.java *.class JavaTokenTypes.txt *.smap
diff --git a/topics/grammars/java/antlr-java-5/studman/Makefile b/topics/grammars/java/antlr-java-5/studman/Makefile
deleted file mode 100644
index bfd596c7..00000000
--- a/topics/grammars/java/antlr-java-5/studman/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-all:
-	make build
-	make run
-
-extract:
-	../../../../extraction/antlr/antlrpp.py java15.rsc.g java15.pp.g
-	java -cp ${CLASSPATH}:../../../../../download/antlrworks-1.1.7.jar:../../../../extraction/antlr slps.antlr2bgf.Tool java15.pp.g studman.ext.bgf
-	../../../../../shared/tools/xbgf post-extraction.xbgf studman.ext.bgf studman.fix.bgf
-	../../../../../shared/tools/subgrammar studman.fix.bgf compilationUnit studman.bgf
-
-build:
-	java -cp ../../../../../download/antlr-3.2.jar antlr.Tool java15.g java15.tree.g
-	javac -cp $$CLASSPATH:../../../../../download/antlr-3.2.jar TestIO.java
-
-run:
-	java -cp $$CLASSPATH:../../../../../download/antlr-3.2.jar TestIO TestIO.java
-
-clean:
-	rm -f Java*.java *.class JavaTokenTypes.txt *.smap
diff --git a/topics/grammars/java/sdf/Makefile b/topics/grammars/java/sdf/Makefile
deleted file mode 100644
index d40c1a6f..00000000
--- a/topics/grammars/java/sdf/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-tdir = ../../../../shared/tools
-sdflib = ../../../../../sdf-library/trunk/library/languages/java/syntax
-
-all:
-	make build
-	make test
-
-build:
-	${tdir}/sdf2bgf ${sdflib}/*.sdf java.sdf.ext.bgf
-	${tdir}/subgrammar java.sdf.ext.bgf Top-sort java.sdf.rec.bgf
-
-test:
-	ls -1 *.bgf | xargs -n1 ${tdir}/validate bgf
-
-clean:
-	rm -f *.bgf
diff --git a/topics/grammars/w3c/Makefile b/topics/grammars/w3c/Makefile
new file mode 100644
index 00000000..ed36d6c6
--- /dev/null
+++ b/topics/grammars/w3c/Makefile
@@ -0,0 +1,7 @@
+include ../Makefile.language
+
+get:
+	curl -k http://www.w3.org/TR/1999/REC-xpath-19991116.xml > xpath1/src.recommendation.xml
+	curl -k http://www.w3.org/XML/1998/06/xmlspec-v20.dtd > xpath1/xmlspec-v20.dtd
+	perl -pi -w -e 's/\/XML\/1998\/06\/xmlspec-v20.dtd/xmlspec-v20.dtd/g;' xpath1/src.recommendation.xml
+	curl -k http://www.w3.org/TR/2007/REC-xpath20-20070123/xpath20.xml > xpath2/src.recommendation.xml
diff --git a/topics/grammars/xpath/extracted-grammar-v1.bgf b/topics/grammars/w3c/extracted-grammar-v1.bgf
similarity index 100%
rename from topics/grammars/xpath/extracted-grammar-v1.bgf
rename to topics/grammars/w3c/extracted-grammar-v1.bgf
diff --git a/topics/grammars/w3c/ready.lst b/topics/grammars/w3c/ready.lst
new file mode 100644
index 00000000..1b45c939
--- /dev/null
+++ b/topics/grammars/w3c/ready.lst
@@ -0,0 +1 @@
+xpath1
diff --git a/topics/grammars/w3c/xpath1/Makefile b/topics/grammars/w3c/xpath1/Makefile
new file mode 100644
index 00000000..a0147065
--- /dev/null
+++ b/topics/grammars/w3c/xpath1/Makefile
@@ -0,0 +1,22 @@
+extract:
+	${tooldir}/spec2bgf src.recommendation.xml ext.bgf
+	${tooldir}/xbgf normalize.xbgf ext.bgf grammar.bgf
+	#${tooldir}/subgrammar xpath.ext.2.bgf Expr xpath.bgf
+
+steps:
+	/usr/local/bin/xsltproc ../../extraction/w3c/spec2bgf.xslt xpath1.xml > xpath.v1.bgf
+	cp xpath.v1.bgf xpath.v2.bgf
+	perl -pi -w -e 's/<unknown>\)\*<\/unknown>/<unknown>\)<\/unknown><postfix-star\/>/g;' xpath.v2.bgf
+	perl -pi -w -e 's/<unknown>\)\?<\/unknown>/<unknown>\)<\/unknown><postfix-optional\/>/g;' xpath.v2.bgf
+	perl -pi -w -e 's/<unknown>\?\)\?<\/unknown>/<postfix-optional\/><unknown>\)<\/unknown><postfix-optional\/>/g;' xpath.v2.bgf
+	perl -pi -w -e "s/<unknown>\(\'.\'<\/unknown>/<unknown>\(<\/unknown><terminal>.<\/terminal>/g;" xpath.v2.bgf
+	perl -pi -w -e 's/<unknown>\(<\/unknown>/<sequence><bgf:expression>/g;' xpath.v2.bgf
+	perl -pi -w -e 's/<unknown>\)<\/unknown>/<\/bgf:expression><\/sequence>/g;' xpath.v2.bgf
+	/usr/local/bin/xsltproc ../../extraction/w3c/postfix2confix.xslt xpath.v2.bgf > xpath.v3.bgf
+	/usr/local/bin/xsltproc ../../extraction/w3c/cleanup.xslt xpath.v3.bgf > xpath.v4.bgf
+	${tooldir}/validate bgf xpath.v4.bgf
+	${tooldir}/xbgf xpath1.normalize.xbgf xpath.v4.bgf xpath.v5.bgf
+	${tooldir}/subgrammar xpath.v5.bgf Expr xpath.v6.bgf
+	${tooldir}/bgf2html xpath.v6.bgf xpath.html
+
+include ../../Makefile.grammar
\ No newline at end of file
diff --git a/topics/grammars/xpath/v1/README.txt b/topics/grammars/w3c/xpath1/README.txt
similarity index 100%
rename from topics/grammars/xpath/v1/README.txt
rename to topics/grammars/w3c/xpath1/README.txt
diff --git a/topics/grammars/xpath/v1/normalize.xbgf b/topics/grammars/w3c/xpath1/normalize.xbgf
similarity index 100%
rename from topics/grammars/xpath/v1/normalize.xbgf
rename to topics/grammars/w3c/xpath1/normalize.xbgf
diff --git a/topics/grammars/xpath/v1/src.recommendation.xml b/topics/grammars/w3c/xpath1/src.recommendation.xml
similarity index 100%
rename from topics/grammars/xpath/v1/src.recommendation.xml
rename to topics/grammars/w3c/xpath1/src.recommendation.xml
diff --git a/topics/grammars/xpath/v1/xmlspec-v20.dtd b/topics/grammars/w3c/xpath1/xmlspec-v20.dtd
similarity index 100%
rename from topics/grammars/xpath/v1/xmlspec-v20.dtd
rename to topics/grammars/w3c/xpath1/xmlspec-v20.dtd
diff --git a/topics/grammars/xpath/v2/src.recommendation.xml b/topics/grammars/w3c/xpath2/src.recommendation.xml
similarity index 100%
rename from topics/grammars/xpath/v2/src.recommendation.xml
rename to topics/grammars/w3c/xpath2/src.recommendation.xml
diff --git a/topics/grammars/xpath/Makefile b/topics/grammars/xpath/Makefile
deleted file mode 100644
index cbb106b6..00000000
--- a/topics/grammars/xpath/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-extract:
-	cd v1 && make extract
-
-get:
-	curl -k http://www.w3.org/TR/1999/REC-xpath-19991116.xml > v1/src.recommendation.xml
-	curl -k http://www.w3.org/XML/1998/06/xmlspec-v20.dtd > v1/xmlspec-v20.dtd
-	perl -pi -w -e 's/\/XML\/1998\/06\/xmlspec-v20.dtd/xmlspec-v20.dtd/g;' v1/src.recommendation.xml
-	curl -k http://www.w3.org/TR/2007/REC-xpath20-20070123/xpath20.xml > v2/src.recommendation.xml
-
-clean:
-	rm -f *~ *.bgf *.html */*~ */*.bgf */*.html