moving JLS convergence study to its rightful place; merging declarati…

…ve and tridirectional initiatives under the MBGF dir
grammarware · May 17, 2012 · b3c0576 · b3c0576
1 parent 64923c9
commit b3c0576
Show file tree

Hide file tree

Showing 189 changed files with 23 additions and 34 deletions.
diff --git a/topics/convergence/ebnf/.gitignore → topics/convergence/exbgf/java/.gitignore b/topics/convergence/ebnf/.gitignore → topics/convergence/exbgf/java/.gitignore
diff --git a/topics/convergence/java/Makefile → topics/convergence/exbgf/java/Makefile b/topics/convergence/java/Makefile → topics/convergence/exbgf/java/Makefile
@@ -1,20 +1,11 @@
-tools = ../../../shared/tools
+tools = ../../../../shared/tools
 validator = ${tools}/validate
 
 build:
 
 test:
-	# make xbgfs
 	${tools}/lci java.lcf architecture
 
-# xbgfs:
-# 	exbgf2xbgf exbgf/unite-read1.exbgf xbgf/unite-read1.xbgf
-# 	exbgf2xbgf exbgf/unite-read2.exbgf xbgf/unite-read2.xbgf
-# 	exbgf2xbgf exbgf/unite-read3.exbgf xbgf/unite-read3.xbgf
-# 	exbgf2xbgf exbgf/deyaccify-read2.exbgf xbgf/deyaccify-read2.xbgf
-# 	exbgf2xbgf exbgf/deyaccify-read3.exbgf xbgf/deyaccify-read3.xbgf
-# 	exbgf2xbgf exbgf/inlineStatements.exbgf xbgf/inlineStatements.xbgf
-# 
 check:
 	${validator} lcf java.lcf
 	ls -1 xbgf/*.xbgf | xargs -n1 ${validator} xbgf

diff --git a/topics/convergence/java/README.txt → topics/convergence/exbgf/java/README.txt b/topics/convergence/java/README.txt → topics/convergence/exbgf/java/README.txt
diff --git a/topics/convergence/ebnf/bgf/.gitignore → topics/convergence/exbgf/java/bgf/.gitignore b/topics/convergence/ebnf/bgf/.gitignore → topics/convergence/exbgf/java/bgf/.gitignore
diff --git a/topics/convergence/java/exbgf/.gitignore → ...s/convergence/exbgf/java/exbgf/.gitignore b/topics/convergence/java/exbgf/.gitignore → ...s/convergence/exbgf/java/exbgf/.gitignore
diff --git a/...onvergence/java/exbgf/correct-impl1.exbgf → ...ence/exbgf/java/exbgf/correct-impl1.exbgf b/...onvergence/java/exbgf/correct-impl1.exbgf → ...ence/exbgf/java/exbgf/correct-impl1.exbgf
diff --git a/...onvergence/java/exbgf/correct-impl2.exbgf → ...ence/exbgf/java/exbgf/correct-impl2.exbgf b/...onvergence/java/exbgf/correct-impl2.exbgf → ...ence/exbgf/java/exbgf/correct-impl2.exbgf
diff --git a/...onvergence/java/exbgf/correct-impl3.exbgf → ...ence/exbgf/java/exbgf/correct-impl3.exbgf b/...onvergence/java/exbgf/correct-impl3.exbgf → ...ence/exbgf/java/exbgf/correct-impl3.exbgf
diff --git a/...onvergence/java/exbgf/correct-read1.exbgf → ...ence/exbgf/java/exbgf/correct-read1.exbgf b/...onvergence/java/exbgf/correct-read1.exbgf → ...ence/exbgf/java/exbgf/correct-read1.exbgf
diff --git a/...onvergence/java/exbgf/correct-read2.exbgf → ...ence/exbgf/java/exbgf/correct-read2.exbgf b/...onvergence/java/exbgf/correct-read2.exbgf → ...ence/exbgf/java/exbgf/correct-read2.exbgf
diff --git a/...onvergence/java/exbgf/correct-read3.exbgf → ...ence/exbgf/java/exbgf/correct-read3.exbgf b/...onvergence/java/exbgf/correct-read3.exbgf → ...ence/exbgf/java/exbgf/correct-read3.exbgf
diff --git a/...vergence/java/exbgf/deyaccify-read2.exbgf → ...ce/exbgf/java/exbgf/deyaccify-read2.exbgf b/...vergence/java/exbgf/deyaccify-read2.exbgf → ...ce/exbgf/java/exbgf/deyaccify-read2.exbgf
diff --git a/...vergence/java/exbgf/deyaccify-read3.exbgf → ...ce/exbgf/java/exbgf/deyaccify-read3.exbgf b/...vergence/java/exbgf/deyaccify-read3.exbgf → ...ce/exbgf/java/exbgf/deyaccify-read3.exbgf
diff --git a/...s/convergence/java/exbgf/edit-read1.exbgf → ...ergence/exbgf/java/exbgf/edit-read1.exbgf b/...s/convergence/java/exbgf/edit-read1.exbgf → ...ergence/exbgf/java/exbgf/edit-read1.exbgf
diff --git a/...s/convergence/java/exbgf/edit-read2.exbgf → ...ergence/exbgf/java/exbgf/edit-read2.exbgf b/...s/convergence/java/exbgf/edit-read2.exbgf → ...ergence/exbgf/java/exbgf/edit-read2.exbgf
diff --git a/...s/convergence/java/exbgf/edit-read3.exbgf → ...ergence/exbgf/java/exbgf/edit-read3.exbgf b/...s/convergence/java/exbgf/edit-read3.exbgf → ...ergence/exbgf/java/exbgf/edit-read3.exbgf
diff --git a/...ergence/java/exbgf/editDeclarations.exbgf → ...e/exbgf/java/exbgf/editDeclarations.exbgf b/...ergence/java/exbgf/editDeclarations.exbgf → ...e/exbgf/java/exbgf/editDeclarations.exbgf
diff --git a/...nce/java/exbgf/editExpressions-jls1.exbgf → ...bgf/java/exbgf/editExpressions-jls1.exbgf b/...nce/java/exbgf/editExpressions-jls1.exbgf → ...bgf/java/exbgf/editExpressions-jls1.exbgf
diff --git a/...ce/java/exbgf/editExpressions-read2.exbgf → ...gf/java/exbgf/editExpressions-read2.exbgf b/...ce/java/exbgf/editExpressions-read2.exbgf → ...gf/java/exbgf/editExpressions-read2.exbgf
diff --git a/...ce/java/exbgf/editExpressions-read3.exbgf → ...gf/java/exbgf/editExpressions-read3.exbgf b/...ce/java/exbgf/editExpressions-read3.exbgf → ...gf/java/exbgf/editExpressions-read3.exbgf
diff --git a/...vergence/java/exbgf/eliminate-read2.exbgf → ...ce/exbgf/java/exbgf/eliminate-read2.exbgf b/...vergence/java/exbgf/eliminate-read2.exbgf → ...ce/exbgf/java/exbgf/eliminate-read2.exbgf
diff --git a/.../convergence/java/exbgf/extend-jls1.exbgf → ...rgence/exbgf/java/exbgf/extend-jls1.exbgf b/.../convergence/java/exbgf/extend-jls1.exbgf → ...rgence/exbgf/java/exbgf/extend-jls1.exbgf
diff --git a/...convergence/java/exbgf/extend-read1.exbgf → ...gence/exbgf/java/exbgf/extend-read1.exbgf b/...convergence/java/exbgf/extend-read1.exbgf → ...gence/exbgf/java/exbgf/extend-read1.exbgf
diff --git a/...onvergence/java/exbgf/extend-read12.exbgf → ...ence/exbgf/java/exbgf/extend-read12.exbgf b/...onvergence/java/exbgf/extend-read12.exbgf → ...ence/exbgf/java/exbgf/extend-read12.exbgf
diff --git a/.../java/exbgf/extendClassDeclarations.exbgf → .../java/exbgf/extendClassDeclarations.exbgf b/.../java/exbgf/extendClassDeclarations.exbgf → .../java/exbgf/extendClassDeclarations.exbgf
diff --git a/...gence/java/exbgf/extendDeclarations.exbgf → ...exbgf/java/exbgf/extendDeclarations.exbgf b/...gence/java/exbgf/extendDeclarations.exbgf → ...exbgf/java/exbgf/extendDeclarations.exbgf
diff --git a/...rgence/java/exbgf/extendExpressions.exbgf → .../exbgf/java/exbgf/extendExpressions.exbgf b/...rgence/java/exbgf/extendExpressions.exbgf → .../exbgf/java/exbgf/extendExpressions.exbgf
diff --git a/...a/exbgf/extendInterfaceDeclarations.exbgf → ...a/exbgf/extendInterfaceDeclarations.exbgf b/...a/exbgf/extendInterfaceDeclarations.exbgf → ...a/exbgf/extendInterfaceDeclarations.exbgf
diff --git a/...vergence/java/exbgf/extendModifiers.exbgf → ...ce/exbgf/java/exbgf/extendModifiers.exbgf b/...vergence/java/exbgf/extendModifiers.exbgf → ...ce/exbgf/java/exbgf/extendModifiers.exbgf
diff --git a/...ergence/java/exbgf/extendStatements.exbgf → ...e/exbgf/java/exbgf/extendStatements.exbgf b/...ergence/java/exbgf/extendStatements.exbgf → ...e/exbgf/java/exbgf/extendStatements.exbgf
diff --git a/...ce/java/exbgf/extendWithAnnotations.exbgf → ...gf/java/exbgf/extendWithAnnotations.exbgf b/...ce/java/exbgf/extendWithAnnotations.exbgf → ...gf/java/exbgf/extendWithAnnotations.exbgf
diff --git a/.../java/exbgf/extendWithTypeArguments.exbgf → .../java/exbgf/extendWithTypeArguments.exbgf b/.../java/exbgf/extendWithTypeArguments.exbgf → .../java/exbgf/extendWithTypeArguments.exbgf
diff --git a/...onvergence/java/exbgf/extract-impl3.exbgf → ...ence/exbgf/java/exbgf/extract-impl3.exbgf b/...onvergence/java/exbgf/extract-impl3.exbgf → ...ence/exbgf/java/exbgf/extract-impl3.exbgf
diff --git a/...ergence/java/exbgf/generalize-impl3.exbgf → ...e/exbgf/java/exbgf/generalize-impl3.exbgf b/...ergence/java/exbgf/generalize-impl3.exbgf → ...e/exbgf/java/exbgf/generalize-impl3.exbgf
diff --git a/...vergence/java/exbgf/generalizeBlock.exbgf → ...ce/exbgf/java/exbgf/generalizeBlock.exbgf b/...vergence/java/exbgf/generalizeBlock.exbgf → ...ce/exbgf/java/exbgf/generalizeBlock.exbgf
diff --git a/...ergence/java/exbgf/generalizeLabels.exbgf → ...e/exbgf/java/exbgf/generalizeLabels.exbgf b/...ergence/java/exbgf/generalizeLabels.exbgf → ...e/exbgf/java/exbgf/generalizeLabels.exbgf
diff --git a/...nce/java/exbgf/generalizeStatements.exbgf → ...bgf/java/exbgf/generalizeStatements.exbgf b/...nce/java/exbgf/generalizeStatements.exbgf → ...bgf/java/exbgf/generalizeStatements.exbgf
diff --git a/...ergence/java/exbgf/inlineStatements.exbgf → ...e/exbgf/java/exbgf/inlineStatements.exbgf b/...ergence/java/exbgf/inlineStatements.exbgf → ...e/exbgf/java/exbgf/inlineStatements.exbgf
diff --git a/...onvergence/java/exbgf/recover-impl3.exbgf → ...ence/exbgf/java/exbgf/recover-impl3.exbgf b/...onvergence/java/exbgf/recover-impl3.exbgf → ...ence/exbgf/java/exbgf/recover-impl3.exbgf
diff --git a/...onvergence/java/exbgf/recover-read2.exbgf → ...ence/exbgf/java/exbgf/recover-read2.exbgf b/...onvergence/java/exbgf/recover-read2.exbgf → ...ence/exbgf/java/exbgf/recover-read2.exbgf
diff --git a/...onvergence/java/exbgf/recover-read3.exbgf → ...ence/exbgf/java/exbgf/recover-read3.exbgf b/...onvergence/java/exbgf/recover-read3.exbgf → ...ence/exbgf/java/exbgf/recover-read3.exbgf
diff --git a/...nvergence/java/exbgf/refactor-impl1.exbgf → ...nce/exbgf/java/exbgf/refactor-impl1.exbgf b/...nvergence/java/exbgf/refactor-impl1.exbgf → ...nce/exbgf/java/exbgf/refactor-impl1.exbgf
diff --git a/...nvergence/java/exbgf/refactor-impl2.exbgf → ...nce/exbgf/java/exbgf/refactor-impl2.exbgf b/...nvergence/java/exbgf/refactor-impl2.exbgf → ...nce/exbgf/java/exbgf/refactor-impl2.exbgf
diff --git a/...nvergence/java/exbgf/refactor-impl3.exbgf → ...nce/exbgf/java/exbgf/refactor-impl3.exbgf b/...nvergence/java/exbgf/refactor-impl3.exbgf → ...nce/exbgf/java/exbgf/refactor-impl3.exbgf
diff --git a/...nvergence/java/exbgf/refactor-read1.exbgf → ...nce/exbgf/java/exbgf/refactor-read1.exbgf b/...nvergence/java/exbgf/refactor-read1.exbgf → ...nce/exbgf/java/exbgf/refactor-read1.exbgf
diff --git a/...ce/java/exbgf/refactorClasses-read2.exbgf → ...gf/java/exbgf/refactorClasses-read2.exbgf b/...ce/java/exbgf/refactorClasses-read2.exbgf → ...gf/java/exbgf/refactorClasses-read2.exbgf
diff --git a/...ce/java/exbgf/refactorClasses-read3.exbgf → ...gf/java/exbgf/refactorClasses-read3.exbgf b/...ce/java/exbgf/refactorClasses-read3.exbgf → ...gf/java/exbgf/refactorClasses-read3.exbgf
diff --git a/...va/exbgf/refactorDeclarations-read2.exbgf → ...va/exbgf/refactorDeclarations-read2.exbgf b/...va/exbgf/refactorDeclarations-read2.exbgf → ...va/exbgf/refactorDeclarations-read2.exbgf
diff --git a/...va/exbgf/refactorDeclarations-read3.exbgf → ...va/exbgf/refactorDeclarations-read3.exbgf b/...va/exbgf/refactorDeclarations-read3.exbgf → ...va/exbgf/refactorDeclarations-read3.exbgf
diff --git a/...onvergence/java/exbgf/refactorEnums.exbgf → ...ence/exbgf/java/exbgf/refactorEnums.exbgf b/...onvergence/java/exbgf/refactorEnums.exbgf → ...ence/exbgf/java/exbgf/refactorEnums.exbgf
diff --git a/...ence/java/exbgf/refactorExpressions.exbgf → ...xbgf/java/exbgf/refactorExpressions.exbgf b/...ence/java/exbgf/refactorExpressions.exbgf → ...xbgf/java/exbgf/refactorExpressions.exbgf
diff --git a/...java/exbgf/refactorInterfaces-read2.exbgf → ...java/exbgf/refactorInterfaces-read2.exbgf b/...java/exbgf/refactorInterfaces-read2.exbgf → ...java/exbgf/refactorInterfaces-read2.exbgf
diff --git a/...java/exbgf/refactorInterfaces-read3.exbgf → ...java/exbgf/refactorInterfaces-read3.exbgf b/...java/exbgf/refactorInterfaces-read3.exbgf → ...java/exbgf/refactorInterfaces-read3.exbgf
diff --git a/.../java/exbgf/refactorMinorMismatches.exbgf → .../java/exbgf/refactorMinorMismatches.exbgf b/.../java/exbgf/refactorMinorMismatches.exbgf → .../java/exbgf/refactorMinorMismatches.exbgf
diff --git a/...nce/java/exbgf/refactorPackageNames.exbgf → ...bgf/java/exbgf/refactorPackageNames.exbgf b/...nce/java/exbgf/refactorPackageNames.exbgf → ...bgf/java/exbgf/refactorPackageNames.exbgf
diff --git a/.../java/exbgf/refactorStatements-jls1.exbgf → .../java/exbgf/refactorStatements-jls1.exbgf b/.../java/exbgf/refactorStatements-jls1.exbgf → .../java/exbgf/refactorStatements-jls1.exbgf
diff --git a/...java/exbgf/refactorStatements-read3.exbgf → ...java/exbgf/refactorStatements-read3.exbgf b/...java/exbgf/refactorStatements-read3.exbgf → ...java/exbgf/refactorStatements-read3.exbgf
diff --git a/...gence/java/exbgf/refactorTypes-jls1.exbgf → ...exbgf/java/exbgf/refactorTypes-jls1.exbgf b/...gence/java/exbgf/refactorTypes-jls1.exbgf → ...exbgf/java/exbgf/refactorTypes-jls1.exbgf
diff --git a/...ence/java/exbgf/refactorTypes-read2.exbgf → ...xbgf/java/exbgf/refactorTypes-read2.exbgf b/...ence/java/exbgf/refactorTypes-read2.exbgf → ...xbgf/java/exbgf/refactorTypes-read2.exbgf
diff --git a/...ence/java/exbgf/refactorTypes-read3.exbgf → ...xbgf/java/exbgf/refactorTypes-read3.exbgf b/...ence/java/exbgf/refactorTypes-read3.exbgf → ...xbgf/java/exbgf/refactorTypes-read3.exbgf
diff --git a/...gence/java/exbgf/relaxClasses-read3.exbgf → ...exbgf/java/exbgf/relaxClasses-read3.exbgf b/...gence/java/exbgf/relaxClasses-read3.exbgf → ...exbgf/java/exbgf/relaxClasses-read3.exbgf
diff --git a/...e/java/exbgf/relaxExpressions-read3.exbgf → ...f/java/exbgf/relaxExpressions-read3.exbgf b/...e/java/exbgf/relaxExpressions-read3.exbgf → ...f/java/exbgf/relaxExpressions-read3.exbgf
diff --git a/...convergence/java/exbgf/rename-impl1.exbgf → ...gence/exbgf/java/exbgf/rename-impl1.exbgf b/...convergence/java/exbgf/rename-impl1.exbgf → ...gence/exbgf/java/exbgf/rename-impl1.exbgf
diff --git a/.../convergence/java/exbgf/rename-jls1.exbgf → ...rgence/exbgf/java/exbgf/rename-jls1.exbgf b/.../convergence/java/exbgf/rename-jls1.exbgf → ...rgence/exbgf/java/exbgf/rename-jls1.exbgf
diff --git a/...convergence/java/exbgf/rename-jls12.exbgf → ...gence/exbgf/java/exbgf/rename-jls12.exbgf b/...convergence/java/exbgf/rename-jls12.exbgf → ...gence/exbgf/java/exbgf/rename-jls12.exbgf
diff --git a/...convergence/java/exbgf/rename-read1.exbgf → ...gence/exbgf/java/exbgf/rename-read1.exbgf b/...convergence/java/exbgf/rename-read1.exbgf → ...gence/exbgf/java/exbgf/rename-read1.exbgf
diff --git a/...onvergence/java/exbgf/rename-read12.exbgf → ...ence/exbgf/java/exbgf/rename-read12.exbgf b/...onvergence/java/exbgf/rename-read12.exbgf → ...ence/exbgf/java/exbgf/rename-read12.exbgf
diff --git a/...convergence/java/exbgf/rename-read2.exbgf → ...gence/exbgf/java/exbgf/rename-read2.exbgf b/...convergence/java/exbgf/rename-read2.exbgf → ...gence/exbgf/java/exbgf/rename-read2.exbgf
diff --git a/...convergence/java/exbgf/rename-read3.exbgf → ...gence/exbgf/java/exbgf/rename-read3.exbgf b/...convergence/java/exbgf/rename-read3.exbgf → ...gence/exbgf/java/exbgf/rename-read3.exbgf
diff --git a/.../convergence/java/exbgf/unite-read1.exbgf → ...rgence/exbgf/java/exbgf/unite-read1.exbgf b/.../convergence/java/exbgf/unite-read1.exbgf → ...rgence/exbgf/java/exbgf/unite-read1.exbgf
diff --git a/.../convergence/java/exbgf/unite-read2.exbgf → ...rgence/exbgf/java/exbgf/unite-read2.exbgf b/.../convergence/java/exbgf/unite-read2.exbgf → ...rgence/exbgf/java/exbgf/unite-read2.exbgf
diff --git a/.../convergence/java/exbgf/unite-read3.exbgf → ...rgence/exbgf/java/exbgf/unite-read3.exbgf b/.../convergence/java/exbgf/unite-read3.exbgf → ...rgence/exbgf/java/exbgf/unite-read3.exbgf
diff --git a/topics/convergence/java/java.lcf → topics/convergence/exbgf/java/java.lcf b/topics/convergence/java/java.lcf → topics/convergence/exbgf/java/java.lcf
@@ -2,11 +2,11 @@
 <lcf:configuration xmlns:lcf="http://planet-sl.org/lcf">
 	<shortcut>
 		<name>slps</name>
-		<expansion>../../..</expansion>
+		<expansion>../../../..</expansion>
 	</shortcut>
 	<shortcut>
 		<name>grammars</name>
-		<expansion>../../grammars</expansion>
+		<expansion>../../../grammars</expansion>
 	</shortcut>
 	<shortcut>
 		<name>tools</name>

diff --git a/topics/convergence/ebnf/snapshot/.gitignore → ...onvergence/exbgf/java/snapshot/.gitignore b/topics/convergence/ebnf/snapshot/.gitignore → ...onvergence/exbgf/java/snapshot/.gitignore
diff --git a/...ence/java/snapshot/architecture_large.pdf → ...xbgf/java/snapshot/architecture_large.pdf b/...ence/java/snapshot/architecture_large.pdf → ...xbgf/java/snapshot/architecture_large.pdf
diff --git a/...ence/java/snapshot/architecture_small.pdf → ...xbgf/java/snapshot/architecture_small.pdf b/...ence/java/snapshot/architecture_small.pdf → ...xbgf/java/snapshot/architecture_small.pdf
diff --git a/topics/convergence/declarative/Makefile → topics/convergence/mbgf/Makefile b/topics/convergence/declarative/Makefile → topics/convergence/mbgf/Makefile
diff --git a/topics/convergence/mbgf/fl/.gitignore b/topics/convergence/mbgf/fl/.gitignore
@@ -0,0 +1,2 @@
+*.xbgf
+*.bgf
diff --git a/topics/convergence/tri/Makefile → topics/convergence/mbgf/fl/Makefile b/topics/convergence/tri/Makefile → topics/convergence/mbgf/fl/Makefile
@@ -1,37 +1,36 @@
-tools = ../../../shared/tools
+tools = ../../../../shared/tools
 validator = ${tools}/validate
 
 d:
-	./mbgf2xbgf.py test.mbgf sdf dcg test.2to1.xbgf
+	../mbgf2xbgf.py fl.mbgf sdf dcg test.2to1.xbgf
 	xbgf test.2to1.xbgf bgf/sdf.bgf bgf/sdf.2.bgf
 	gdts bgf/sdf.2.bgf bgf/dcg.bgf
 
-tst:
-	./m2 test.mbgf sdf rsc
+test:
+	./m2 fl.mbgf sdf rsc
 
 go:
-	./mbgf2xbgf.py test.mbgf 3 2 test.3to2.xbgf
+	../mbgf2xbgf.py fl.mbgf 3 2 test.3to2.xbgf
 	xbgf test.3to2.xbgf bgf/rascal.bgf bgf/rascal.2.bgf
 	gdts bgf/rascal.2.bgf bgf/sdf.bgf
-	./mbgf2xbgf.py test.mbgf 1 2 test.1to2.xbgf
+	../mbgf2xbgf.py fl.mbgf 1 2 test.1to2.xbgf
 	xbgf test.1to2.xbgf bgf/dcg.bgf bgf/dcg.2.bgf
 	gdts bgf/dcg.2.bgf bgf/sdf.bgf
 
 t:
-	./mbgf2xbgf.py test.mbgf 1 3 test.res.xbgf
+	../mbgf2xbgf.py fl.mbgf 1 3 test.res.xbgf
 	xbgf2xbnf test.res.xbgf
 
 try:
-	xsltproc --stringparam in 1 --stringparam out 2 ~/projects/slps/shared/xsl/mbgf2xbgf.xslt test.mbgf > test.1to2.xbgf
+	xsltproc --stringparam in 1 --stringparam out 2 ~/projects/slps/shared/xsl/mbgf2xbgf.xslt fl.mbgf > test.1to2.xbgf
 	xbgf test.1to2.xbgf bgf/dcg.bgf bgf/dcg.2.bgf
 	gdts bgf/dcg.2.bgf bgf/rascal.bgf
-	xsltproc --stringparam in 3 --stringparam out 2 ~/projects/slps/shared/xsl/mbgf2xbgf.xslt test.mbgf > test.1to2.xbgf
+	xsltproc --stringparam in 3 --stringparam out 2 ~/projects/slps/shared/xsl/mbgf2xbgf.xslt fl.mbgf > test.1to2.xbgf
 	xbgf test.1to2.xbgf bgf/dcg.bgf bgf/dcg.2.bgf
 
 build:
-
-test:
-	${tools}/lci fl.lcf architecture
+	cp ../../xbgf/fl/snapshot/*.bgf snapshot/
+	cp ../../xbgf/fl/snapshot/*.bgf bgf/
 
 check:
 	${validator} lcf fl.lcf
@@ -41,9 +40,6 @@ check:
 clean:
 	rm -f *~
 	rm -f codesamples/* xmlsamples/* bgf/*
-	rm -f xbgf/stripTerminals.xbgf xbgf/stripSelectors.xbgf
-	rm -f xbgf/rename-om.xbgf xbgf/rename-sdf.xbgf xbgf/rename-jaxb.xbgf xbgf/rename-xsd.xbgf xbgf/rename-model.xbgf
-	rm -f xbgf/reroot-lower.xbgf xbgf/reroot-upper.xbgf
 	rm -rf bin obj
 	rm -f *.user *.suo
 	rm -f architecture*

diff --git a/topics/convergence/java/bgf/.gitignore → topics/convergence/mbgf/fl/bgf/.gitignore b/topics/convergence/java/bgf/.gitignore → topics/convergence/mbgf/fl/bgf/.gitignore
diff --git a/topics/convergence/tri/test.mbgf → topics/convergence/mbgf/fl/fl.mbgf b/topics/convergence/tri/test.mbgf → topics/convergence/mbgf/fl/fl.mbgf
diff --git a/topics/convergence/tri/m1 → topics/convergence/mbgf/fl/m1 b/topics/convergence/tri/m1 → topics/convergence/mbgf/fl/m1
@@ -2,7 +2,7 @@
 
 # m1 file.mbgf one two
 # $0    $1     $2  $3
-./mbgf2xbgf.py $1 $2 $3 tmp.xbgf
+../mbgf2xbgf.py $1 $2 $3 tmp.xbgf
 xbgf tmp.xbgf `xpath $1 'mbgf:sequence/sources/src[@name="'$2'"]/text()' 2> /dev/null` tmp1.bgf
 gdt tmp1.bgf `xpath $1 'mbgf:sequence/sources/src[@name="'$3'"]/text()' 2> /dev/null` || exit -1
 rm tmp.xbgf tmp1.bgf
diff --git a/topics/convergence/tri/m2 → topics/convergence/mbgf/fl/m2 b/topics/convergence/tri/m2 → topics/convergence/mbgf/fl/m2
diff --git a/topics/convergence/tri/m3 → topics/convergence/mbgf/fl/m3 b/topics/convergence/tri/m3 → topics/convergence/mbgf/fl/m3
diff --git a/topics/convergence/java/snapshot/.gitignore → ...s/convergence/mbgf/fl/snapshot/.gitignore b/topics/convergence/java/snapshot/.gitignore → ...s/convergence/mbgf/fl/snapshot/.gitignore
diff --git a/topics/convergence/tri/mbgf2xbgf.py → topics/convergence/mbgf/mbgf2xbgf.py b/topics/convergence/tri/mbgf2xbgf.py → topics/convergence/mbgf/mbgf2xbgf.py
diff --git a/.../convergence/declarative/tests/.gitignore → topics/convergence/mbgf/tests/.gitignore b/.../convergence/declarative/tests/.gitignore → topics/convergence/mbgf/tests/.gitignore
diff --git a/...cs/convergence/declarative/tests/Makefile → topics/convergence/mbgf/tests/Makefile b/...cs/convergence/declarative/tests/Makefile → topics/convergence/mbgf/tests/Makefile
diff --git a/...ce/declarative/tests/fold-labels-fl-1.bgf → ...nvergence/mbgf/tests/fold-labels-fl-1.bgf b/...ce/declarative/tests/fold-labels-fl-1.bgf → ...nvergence/mbgf/tests/fold-labels-fl-1.bgf
diff --git a/...ce/declarative/tests/fold-labels-fl-2.bgf → ...nvergence/mbgf/tests/fold-labels-fl-2.bgf b/...ce/declarative/tests/fold-labels-fl-2.bgf → ...nvergence/mbgf/tests/fold-labels-fl-2.bgf
diff --git a/...ce/declarative/tests/fold-labels-fl-3.bgf → ...nvergence/mbgf/tests/fold-labels-fl-3.bgf b/...ce/declarative/tests/fold-labels-fl-3.bgf → ...nvergence/mbgf/tests/fold-labels-fl-3.bgf
diff --git a/...nce/declarative/tests/fold-labels-fl.mbgf → ...onvergence/mbgf/tests/fold-labels-fl.mbgf b/...nce/declarative/tests/fold-labels-fl.mbgf → ...onvergence/mbgf/tests/fold-labels-fl.mbgf
diff --git a/...ce/declarative/tests/fold-labels-lf-1.bgf → ...nvergence/mbgf/tests/fold-labels-lf-1.bgf b/...ce/declarative/tests/fold-labels-lf-1.bgf → ...nvergence/mbgf/tests/fold-labels-lf-1.bgf
diff --git a/...ce/declarative/tests/fold-labels-lf-2.bgf → ...nvergence/mbgf/tests/fold-labels-lf-2.bgf b/...ce/declarative/tests/fold-labels-lf-2.bgf → ...nvergence/mbgf/tests/fold-labels-lf-2.bgf
diff --git a/...ce/declarative/tests/fold-labels-lf-3.bgf → ...nvergence/mbgf/tests/fold-labels-lf-3.bgf b/...ce/declarative/tests/fold-labels-lf-3.bgf → ...nvergence/mbgf/tests/fold-labels-lf-3.bgf
diff --git a/...nce/declarative/tests/fold-labels-lf.mbgf → ...onvergence/mbgf/tests/fold-labels-lf.mbgf b/...nce/declarative/tests/fold-labels-lf.mbgf → ...onvergence/mbgf/tests/fold-labels-lf.mbgf
diff --git a/...ce/declarative/tests/fold-names-any-1.bgf → ...nvergence/mbgf/tests/fold-names-any-1.bgf b/...ce/declarative/tests/fold-names-any-1.bgf → ...nvergence/mbgf/tests/fold-names-any-1.bgf
diff --git a/...ce/declarative/tests/fold-names-any-2.bgf → ...nvergence/mbgf/tests/fold-names-any-2.bgf b/...ce/declarative/tests/fold-names-any-2.bgf → ...nvergence/mbgf/tests/fold-names-any-2.bgf
diff --git a/...ce/declarative/tests/fold-names-any-3.bgf → ...nvergence/mbgf/tests/fold-names-any-3.bgf b/...ce/declarative/tests/fold-names-any-3.bgf → ...nvergence/mbgf/tests/fold-names-any-3.bgf
diff --git a/...nce/declarative/tests/fold-names-any.mbgf → ...onvergence/mbgf/tests/fold-names-any.mbgf b/...nce/declarative/tests/fold-names-any.mbgf → ...onvergence/mbgf/tests/fold-names-any.mbgf
diff --git a/...eclarative/tests/fold-names-ordered-1.bgf → ...gence/mbgf/tests/fold-names-ordered-1.bgf b/...eclarative/tests/fold-names-ordered-1.bgf → ...gence/mbgf/tests/fold-names-ordered-1.bgf
diff --git a/...eclarative/tests/fold-names-ordered-2.bgf → ...gence/mbgf/tests/fold-names-ordered-2.bgf b/...eclarative/tests/fold-names-ordered-2.bgf → ...gence/mbgf/tests/fold-names-ordered-2.bgf
diff --git a/...eclarative/tests/fold-names-ordered-3.bgf → ...gence/mbgf/tests/fold-names-ordered-3.bgf b/...eclarative/tests/fold-names-ordered-3.bgf → ...gence/mbgf/tests/fold-names-ordered-3.bgf
diff --git a/...declarative/tests/fold-names-ordered.mbgf → ...rgence/mbgf/tests/fold-names-ordered.mbgf b/...declarative/tests/fold-names-ordered.mbgf → ...rgence/mbgf/tests/fold-names-ordered.mbgf
diff --git a/...ence/declarative/tests/folding-easy-1.bgf → ...convergence/mbgf/tests/folding-easy-1.bgf b/...ence/declarative/tests/folding-easy-1.bgf → ...convergence/mbgf/tests/folding-easy-1.bgf
diff --git a/...ence/declarative/tests/folding-easy-2.bgf → ...convergence/mbgf/tests/folding-easy-2.bgf b/...ence/declarative/tests/folding-easy-2.bgf → ...convergence/mbgf/tests/folding-easy-2.bgf
diff --git a/...ence/declarative/tests/folding-easy-3.bgf → ...convergence/mbgf/tests/folding-easy-3.bgf b/...ence/declarative/tests/folding-easy-3.bgf → ...convergence/mbgf/tests/folding-easy-3.bgf
diff --git a/...gence/declarative/tests/folding-easy.mbgf → .../convergence/mbgf/tests/folding-easy.mbgf b/...gence/declarative/tests/folding-easy.mbgf → .../convergence/mbgf/tests/folding-easy.mbgf
diff --git a/...nce/declarative/tests/iteration-irl-1.bgf → ...onvergence/mbgf/tests/iteration-irl-1.bgf b/...nce/declarative/tests/iteration-irl-1.bgf → ...onvergence/mbgf/tests/iteration-irl-1.bgf
diff --git a/...nce/declarative/tests/iteration-irl-2.bgf → ...onvergence/mbgf/tests/iteration-irl-2.bgf b/...nce/declarative/tests/iteration-irl-2.bgf → ...onvergence/mbgf/tests/iteration-irl-2.bgf
diff --git a/...nce/declarative/tests/iteration-irl-3.bgf → ...onvergence/mbgf/tests/iteration-irl-3.bgf b/...nce/declarative/tests/iteration-irl-3.bgf → ...onvergence/mbgf/tests/iteration-irl-3.bgf
diff --git a/...ence/declarative/tests/iteration-irl.mbgf → ...convergence/mbgf/tests/iteration-irl.mbgf b/...ence/declarative/tests/iteration-irl.mbgf → ...convergence/mbgf/tests/iteration-irl.mbgf
diff --git a/...e/declarative/tests/iteration-nosep-1.bgf → ...vergence/mbgf/tests/iteration-nosep-1.bgf b/...e/declarative/tests/iteration-nosep-1.bgf → ...vergence/mbgf/tests/iteration-nosep-1.bgf
diff --git a/...e/declarative/tests/iteration-nosep-2.bgf → ...vergence/mbgf/tests/iteration-nosep-2.bgf b/...e/declarative/tests/iteration-nosep-2.bgf → ...vergence/mbgf/tests/iteration-nosep-2.bgf
diff --git a/...e/declarative/tests/iteration-nosep-3.bgf → ...vergence/mbgf/tests/iteration-nosep-3.bgf b/...e/declarative/tests/iteration-nosep-3.bgf → ...vergence/mbgf/tests/iteration-nosep-3.bgf
diff --git a/...ce/declarative/tests/iteration-nosep.mbgf → ...nvergence/mbgf/tests/iteration-nosep.mbgf b/...ce/declarative/tests/iteration-nosep.mbgf → ...nvergence/mbgf/tests/iteration-nosep.mbgf
diff --git a/...gence/declarative/tests/labels-many-1.bgf → .../convergence/mbgf/tests/labels-many-1.bgf b/...gence/declarative/tests/labels-many-1.bgf → .../convergence/mbgf/tests/labels-many-1.bgf
diff --git a/...gence/declarative/tests/labels-many-2.bgf → .../convergence/mbgf/tests/labels-many-2.bgf b/...gence/declarative/tests/labels-many-2.bgf → .../convergence/mbgf/tests/labels-many-2.bgf
diff --git a/...gence/declarative/tests/labels-many-3.bgf → .../convergence/mbgf/tests/labels-many-3.bgf b/...gence/declarative/tests/labels-many-3.bgf → .../convergence/mbgf/tests/labels-many-3.bgf
diff --git a/...rgence/declarative/tests/labels-many.mbgf → ...s/convergence/mbgf/tests/labels-many.mbgf b/...rgence/declarative/tests/labels-many.mbgf → ...s/convergence/mbgf/tests/labels-many.mbgf
diff --git a/...gence/declarative/tests/labels-same-1.bgf → .../convergence/mbgf/tests/labels-same-1.bgf b/...gence/declarative/tests/labels-same-1.bgf → .../convergence/mbgf/tests/labels-same-1.bgf
diff --git a/...gence/declarative/tests/labels-same-2.bgf → .../convergence/mbgf/tests/labels-same-2.bgf b/...gence/declarative/tests/labels-same-2.bgf → .../convergence/mbgf/tests/labels-same-2.bgf
diff --git a/...gence/declarative/tests/labels-same-3.bgf → .../convergence/mbgf/tests/labels-same-3.bgf b/...gence/declarative/tests/labels-same-3.bgf → .../convergence/mbgf/tests/labels-same-3.bgf
diff --git a/...rgence/declarative/tests/labels-same.mbgf → ...s/convergence/mbgf/tests/labels-same.mbgf b/...rgence/declarative/tests/labels-same.mbgf → ...s/convergence/mbgf/tests/labels-same.mbgf
diff --git a/...onvergence/declarative/tests/list.numbers → topics/convergence/mbgf/tests/list.numbers b/...onvergence/declarative/tests/list.numbers → topics/convergence/mbgf/tests/list.numbers
diff --git a/topics/convergence/declarative/tests/m1 → topics/convergence/mbgf/tests/m1 b/topics/convergence/declarative/tests/m1 → topics/convergence/mbgf/tests/m1
diff --git a/...rgence/declarative/tests/naming-abc-1.bgf → ...s/convergence/mbgf/tests/naming-abc-1.bgf b/...rgence/declarative/tests/naming-abc-1.bgf → ...s/convergence/mbgf/tests/naming-abc-1.bgf
diff --git a/...rgence/declarative/tests/naming-abc-2.bgf → ...s/convergence/mbgf/tests/naming-abc-2.bgf b/...rgence/declarative/tests/naming-abc-2.bgf → ...s/convergence/mbgf/tests/naming-abc-2.bgf
diff --git a/...rgence/declarative/tests/naming-abc-3.bgf → ...s/convergence/mbgf/tests/naming-abc-3.bgf b/...rgence/declarative/tests/naming-abc-3.bgf → ...s/convergence/mbgf/tests/naming-abc-3.bgf
diff --git a/...ergence/declarative/tests/naming-abc.mbgf → ...cs/convergence/mbgf/tests/naming-abc.mbgf b/...ergence/declarative/tests/naming-abc.mbgf → ...cs/convergence/mbgf/tests/naming-abc.mbgf
diff --git a/...rgence/declarative/tests/naming-dde-1.bgf → ...s/convergence/mbgf/tests/naming-dde-1.bgf b/...rgence/declarative/tests/naming-dde-1.bgf → ...s/convergence/mbgf/tests/naming-dde-1.bgf
diff --git a/...rgence/declarative/tests/naming-dde-2.bgf → ...s/convergence/mbgf/tests/naming-dde-2.bgf b/...rgence/declarative/tests/naming-dde-2.bgf → ...s/convergence/mbgf/tests/naming-dde-2.bgf
diff --git a/...rgence/declarative/tests/naming-dde-3.bgf → ...s/convergence/mbgf/tests/naming-dde-3.bgf b/...rgence/declarative/tests/naming-dde-3.bgf → ...s/convergence/mbgf/tests/naming-dde-3.bgf
diff --git a/...ergence/declarative/tests/naming-dde.mbgf → ...cs/convergence/mbgf/tests/naming-dde.mbgf b/...ergence/declarative/tests/naming-dde.mbgf → ...cs/convergence/mbgf/tests/naming-dde.mbgf
diff --git a/...s/convergence/declarative/tests/quiettest → topics/convergence/mbgf/tests/quiettest b/...s/convergence/declarative/tests/quiettest → topics/convergence/mbgf/tests/quiettest
diff --git a/.../declarative/tests/selectables-many-1.bgf → ...ergence/mbgf/tests/selectables-many-1.bgf b/.../declarative/tests/selectables-many-1.bgf → ...ergence/mbgf/tests/selectables-many-1.bgf
diff --git a/.../declarative/tests/selectables-many-2.bgf → ...ergence/mbgf/tests/selectables-many-2.bgf b/.../declarative/tests/selectables-many-2.bgf → ...ergence/mbgf/tests/selectables-many-2.bgf
diff --git a/.../declarative/tests/selectables-many-3.bgf → ...ergence/mbgf/tests/selectables-many-3.bgf b/.../declarative/tests/selectables-many-3.bgf → ...ergence/mbgf/tests/selectables-many-3.bgf
diff --git a/...e/declarative/tests/selectables-many.mbgf → ...vergence/mbgf/tests/selectables-many.mbgf b/...e/declarative/tests/selectables-many.mbgf → ...vergence/mbgf/tests/selectables-many.mbgf
diff --git a/...declarative/tests/selectables-multi-1.bgf → ...rgence/mbgf/tests/selectables-multi-1.bgf b/...declarative/tests/selectables-multi-1.bgf → ...rgence/mbgf/tests/selectables-multi-1.bgf
diff --git a/...declarative/tests/selectables-multi-2.bgf → ...rgence/mbgf/tests/selectables-multi-2.bgf b/...declarative/tests/selectables-multi-2.bgf → ...rgence/mbgf/tests/selectables-multi-2.bgf
diff --git a/...declarative/tests/selectables-multi-3.bgf → ...rgence/mbgf/tests/selectables-multi-3.bgf b/...declarative/tests/selectables-multi-3.bgf → ...rgence/mbgf/tests/selectables-multi-3.bgf
diff --git a/.../declarative/tests/selectables-multi.mbgf → ...ergence/mbgf/tests/selectables-multi.mbgf b/.../declarative/tests/selectables-multi.mbgf → ...ergence/mbgf/tests/selectables-multi.mbgf
diff --git a/...e/declarative/tests/selectables-one-1.bgf → ...vergence/mbgf/tests/selectables-one-1.bgf b/...e/declarative/tests/selectables-one-1.bgf → ...vergence/mbgf/tests/selectables-one-1.bgf
diff --git a/...e/declarative/tests/selectables-one-2.bgf → ...vergence/mbgf/tests/selectables-one-2.bgf b/...e/declarative/tests/selectables-one-2.bgf → ...vergence/mbgf/tests/selectables-one-2.bgf
diff --git a/...e/declarative/tests/selectables-one-3.bgf → ...vergence/mbgf/tests/selectables-one-3.bgf b/...e/declarative/tests/selectables-one-3.bgf → ...vergence/mbgf/tests/selectables-one-3.bgf
diff --git a/...ce/declarative/tests/selectables-one.mbgf → ...nvergence/mbgf/tests/selectables-one.mbgf b/...ce/declarative/tests/selectables-one.mbgf → ...nvergence/mbgf/tests/selectables-one.mbgf
diff --git a/...cs/convergence/declarative/tests/testcopy → topics/convergence/mbgf/tests/testcopy b/...cs/convergence/declarative/tests/testcopy → topics/convergence/mbgf/tests/testcopy
diff --git a/...convergence/declarative/tests/testperform → topics/convergence/mbgf/tests/testperform b/...convergence/declarative/tests/testperform → topics/convergence/mbgf/tests/testperform
diff --git a/...nce/declarative/tests/topchoice-hhv-1.bgf → ...onvergence/mbgf/tests/topchoice-hhv-1.bgf b/...nce/declarative/tests/topchoice-hhv-1.bgf → ...onvergence/mbgf/tests/topchoice-hhv-1.bgf
diff --git a/...nce/declarative/tests/topchoice-hhv-2.bgf → ...onvergence/mbgf/tests/topchoice-hhv-2.bgf b/...nce/declarative/tests/topchoice-hhv-2.bgf → ...onvergence/mbgf/tests/topchoice-hhv-2.bgf
diff --git a/...nce/declarative/tests/topchoice-hhv-3.bgf → ...onvergence/mbgf/tests/topchoice-hhv-3.bgf b/...nce/declarative/tests/topchoice-hhv-3.bgf → ...onvergence/mbgf/tests/topchoice-hhv-3.bgf
diff --git a/...ence/declarative/tests/topchoice-hhv.mbgf → ...convergence/mbgf/tests/topchoice-hhv.mbgf b/...ence/declarative/tests/topchoice-hhv.mbgf → ...convergence/mbgf/tests/topchoice-hhv.mbgf
diff --git a/.../declarative/tests/unification-easy-1.bgf → ...ergence/mbgf/tests/unification-easy-1.bgf b/.../declarative/tests/unification-easy-1.bgf → ...ergence/mbgf/tests/unification-easy-1.bgf
diff --git a/.../declarative/tests/unification-easy-2.bgf → ...ergence/mbgf/tests/unification-easy-2.bgf b/.../declarative/tests/unification-easy-2.bgf → ...ergence/mbgf/tests/unification-easy-2.bgf
diff --git a/.../declarative/tests/unification-easy-3.bgf → ...ergence/mbgf/tests/unification-easy-3.bgf b/.../declarative/tests/unification-easy-3.bgf → ...ergence/mbgf/tests/unification-easy-3.bgf
diff --git a/...e/declarative/tests/unification-easy.mbgf → ...vergence/mbgf/tests/unification-easy.mbgf b/...e/declarative/tests/unification-easy.mbgf → ...vergence/mbgf/tests/unification-easy.mbgf
diff --git a/.../declarative/tests/unification-hard-1.bgf → ...ergence/mbgf/tests/unification-hard-1.bgf b/.../declarative/tests/unification-hard-1.bgf → ...ergence/mbgf/tests/unification-hard-1.bgf
diff --git a/.../declarative/tests/unification-hard-2.bgf → ...ergence/mbgf/tests/unification-hard-2.bgf b/.../declarative/tests/unification-hard-2.bgf → ...ergence/mbgf/tests/unification-hard-2.bgf
diff --git a/.../declarative/tests/unification-hard-3.bgf → ...ergence/mbgf/tests/unification-hard-3.bgf b/.../declarative/tests/unification-hard-3.bgf → ...ergence/mbgf/tests/unification-hard-3.bgf
diff --git a/...e/declarative/tests/unification-hard.mbgf → ...vergence/mbgf/tests/unification-hard.mbgf b/...e/declarative/tests/unification-hard.mbgf → ...vergence/mbgf/tests/unification-hard.mbgf
diff --git a/.../declarative/tests/unification-semi-1.bgf → ...ergence/mbgf/tests/unification-semi-1.bgf b/.../declarative/tests/unification-semi-1.bgf → ...ergence/mbgf/tests/unification-semi-1.bgf
diff --git a/.../declarative/tests/unification-semi-2.bgf → ...ergence/mbgf/tests/unification-semi-2.bgf b/.../declarative/tests/unification-semi-2.bgf → ...ergence/mbgf/tests/unification-semi-2.bgf
diff --git a/.../declarative/tests/unification-semi-3.bgf → ...ergence/mbgf/tests/unification-semi-3.bgf b/.../declarative/tests/unification-semi-3.bgf → ...ergence/mbgf/tests/unification-semi-3.bgf
diff --git a/...e/declarative/tests/unification-semi.mbgf → ...vergence/mbgf/tests/unification-semi.mbgf b/...e/declarative/tests/unification-semi.mbgf → ...vergence/mbgf/tests/unification-semi.mbgf
diff --git a/...ergence/declarative/tests/width-esp-1.bgf → ...cs/convergence/mbgf/tests/width-esp-1.bgf b/...ergence/declarative/tests/width-esp-1.bgf → ...cs/convergence/mbgf/tests/width-esp-1.bgf
diff --git a/...ergence/declarative/tests/width-esp-2.bgf → ...cs/convergence/mbgf/tests/width-esp-2.bgf b/...ergence/declarative/tests/width-esp-2.bgf → ...cs/convergence/mbgf/tests/width-esp-2.bgf
diff --git a/...ergence/declarative/tests/width-esp-3.bgf → ...cs/convergence/mbgf/tests/width-esp-3.bgf b/...ergence/declarative/tests/width-esp-3.bgf → ...cs/convergence/mbgf/tests/width-esp-3.bgf
diff --git a/...vergence/declarative/tests/width-esp.mbgf → topics/convergence/mbgf/tests/width-esp.mbgf b/...vergence/declarative/tests/width-esp.mbgf → topics/convergence/mbgf/tests/width-esp.mbgf
diff --git a/...ergence/declarative/tests/width-qse-1.bgf → ...cs/convergence/mbgf/tests/width-qse-1.bgf b/...ergence/declarative/tests/width-qse-1.bgf → ...cs/convergence/mbgf/tests/width-qse-1.bgf
diff --git a/...ergence/declarative/tests/width-qse-2.bgf → ...cs/convergence/mbgf/tests/width-qse-2.bgf b/...ergence/declarative/tests/width-qse-2.bgf → ...cs/convergence/mbgf/tests/width-qse-2.bgf
diff --git a/...ergence/declarative/tests/width-qse-3.bgf → ...cs/convergence/mbgf/tests/width-qse-3.bgf b/...ergence/declarative/tests/width-qse-3.bgf → ...cs/convergence/mbgf/tests/width-qse-3.bgf
diff --git a/...vergence/declarative/tests/width-qse.mbgf → topics/convergence/mbgf/tests/width-qse.mbgf b/...vergence/declarative/tests/width-qse.mbgf → topics/convergence/mbgf/tests/width-qse.mbgf
diff --git a/topics/convergence/tri/.gitignore b/topics/convergence/tri/.gitignore
diff --git a/topics/convergence/java/.gitignore → topics/convergence/xbgf/ebnf/.gitignore b/topics/convergence/java/.gitignore → topics/convergence/xbgf/ebnf/.gitignore
diff --git a/topics/convergence/ebnf/Makefile → topics/convergence/xbgf/ebnf/Makefile b/topics/convergence/ebnf/Makefile → topics/convergence/xbgf/ebnf/Makefile
@@ -1,12 +1,12 @@
-validator = ../../../shared/tools/validate
+validator = ../../../../shared/tools/validate
 
 all:
 	make clean
 	make test
 	make check
 
 test:
-	../../../shared/tools/lci bnf.lcf architecture
+	../../lci/lci.py bnf.lcf architecture
 
 check:
 	${validator} lcf bnf.lcf

diff --git a/topics/convergence/ebnf/README.txt → topics/convergence/xbgf/ebnf/README.txt b/topics/convergence/ebnf/README.txt → topics/convergence/xbgf/ebnf/README.txt
diff --git a/topics/convergence/xbgf/ebnf/bgf/.gitignore b/topics/convergence/xbgf/ebnf/bgf/.gitignore
@@ -0,0 +1 @@
+*.bgf
diff --git a/topics/convergence/ebnf/bnf.bgf → topics/convergence/xbgf/ebnf/bnf.bgf b/topics/convergence/ebnf/bnf.bgf → topics/convergence/xbgf/ebnf/bnf.bgf
diff --git a/topics/convergence/ebnf/bnf.lcf → topics/convergence/xbgf/ebnf/bnf.lcf b/topics/convergence/ebnf/bnf.lcf → topics/convergence/xbgf/ebnf/bnf.lcf
@@ -2,7 +2,7 @@
 <lcf:configuration xmlns:lcf="http://planet-sl.org/lcf">
 	<shortcut>
 		<name>slps</name>
-		<expansion>../../..</expansion>
+		<expansion>../../../..</expansion>
 	</shortcut>
 	<shortcut>
 		<name>schemata</name>
@@ -42,7 +42,7 @@
 	<source>
 		<name>ebnf-bgf</name>
 		<grammar>
-			<extraction>cp ../../grammars/metasyntax/ebnf-bgf/grammar.bgf</extraction>
+			<extraction>cp ../../../grammars/metasyntax/ebnf-bgf/grammar.bgf</extraction>
 		</grammar>
 	</source>
 	<!-- <source>

diff --git a/topics/convergence/xbgf/ebnf/snapshot/.gitignore b/topics/convergence/xbgf/ebnf/snapshot/.gitignore
@@ -0,0 +1 @@
+*.bgf
diff --git a/...ence/ebnf/snapshot/architecture_large.pdf → ...xbgf/ebnf/snapshot/architecture_large.pdf b/...ence/ebnf/snapshot/architecture_large.pdf → ...xbgf/ebnf/snapshot/architecture_large.pdf
diff --git a/...ence/ebnf/snapshot/architecture_small.pdf → ...xbgf/ebnf/snapshot/architecture_small.pdf b/...ence/ebnf/snapshot/architecture_small.pdf → ...xbgf/ebnf/snapshot/architecture_small.pdf
diff --git a/topics/convergence/ebnf/xbgf/designate.xbgf → ...convergence/xbgf/ebnf/xbgf/designate.xbgf b/topics/convergence/ebnf/xbgf/designate.xbgf → ...convergence/xbgf/ebnf/xbgf/designate.xbgf
diff --git a/topics/convergence/ebnf/xbgf/preferBnf.xbgf → ...convergence/xbgf/ebnf/xbgf/preferBnf.xbgf b/topics/convergence/ebnf/xbgf/preferBnf.xbgf → ...convergence/xbgf/ebnf/xbgf/preferBnf.xbgf
diff --git a/...cs/convergence/ebnf/xbgf/refactorBnf.xbgf → ...nvergence/xbgf/ebnf/xbgf/refactorBnf.xbgf b/...cs/convergence/ebnf/xbgf/refactorBnf.xbgf → ...nvergence/xbgf/ebnf/xbgf/refactorBnf.xbgf
diff --git a/topics/convergence/ebnf/xbgf/renameBgf.xbgf → ...convergence/xbgf/ebnf/xbgf/renameBgf.xbgf b/topics/convergence/ebnf/xbgf/renameBgf.xbgf → ...convergence/xbgf/ebnf/xbgf/renameBgf.xbgf
diff --git a/...convergence/ebnf/xbgf/stripTerminals.xbgf → ...rgence/xbgf/ebnf/xbgf/stripTerminals.xbgf b/...convergence/ebnf/xbgf/stripTerminals.xbgf → ...rgence/xbgf/ebnf/xbgf/stripTerminals.xbgf
diff --git a/...onvergence/ebnf/xbgf/stripWhitespace.xbgf → ...gence/xbgf/ebnf/xbgf/stripWhitespace.xbgf b/...onvergence/ebnf/xbgf/stripWhitespace.xbgf → ...gence/xbgf/ebnf/xbgf/stripWhitespace.xbgf