diff --git a/topics/convergence/fl-sliced/Makefile b/topics/convergence/fl-sliced/Makefile deleted file mode 100644 index ce60f81d..00000000 --- a/topics/convergence/fl-sliced/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -validator = ../../../shared/tools/validate - -build: - time make slice - time make test - time make csv - -slice: - ../../../shared/python/sliceXbgfs.py ../fl/fl.lcf . - -test: - ../../../shared/tools/lci fl.lcf architecture - -csv: - ../../../shared/python/lcf2csv.py fl.lcf ../../../shared/tools/gdt csv - -check: - ${validator} lcf fl.lcf - ls -1 xbgf/*.xbgf | xargs -n1 ${validator} xbgf - ls -1 bgf/*.bgf | xargs -n1 ${validator} bgf - -clean: - rm -f *~ - rm -f bgf/* xbgf/* *.txt TMP-res - rm -rf bin obj - rm -f *.user *.suo - rm -f architecture* - rm -f fl.log - diff --git a/topics/convergence/fl-sliced/fl.lcf b/topics/convergence/fl-sliced/fl.lcf deleted file mode 100644 index ff7252a4..00000000 --- a/topics/convergence/fl-sliced/fl.lcf +++ /dev/null @@ -1,347 +0,0 @@ - - - - slps - ../../.. - - - fl - ../../fl - - - tools - slps/shared/tools - - - wrappers - slps/shared/wrappers - - - generators - slps/shared/generators - - - - tools/xbgf - tools/xbtf - - - tools/gdt - tools/tdt - - - tools/validate bgf - tools/validate btf - - - case - generators/casexbgf 3 - - - stript - generators/striptxbgf - - - strips - generators/stripsxbgf - - - reroot2top - generators/reroot2top - - - - antlr - - tools/antlr2bgf fl/java1/FL.g - - wrappers/runantlrparser - - wrappers/runantlrevaluator - - - - codesamples - - - - dcg - - tools/dcg2bgf fl/prolog1/Parser.pro - - wrappers/runprologparser - - wrappers/runprologevaluator - - - - codesamples - - - - sdf - - tools/sdf2bgf fl/asfsdf/*.sdf - - wrappers/runasfsdfparser - - wrappers/runasfsdfevaluator - - - - tools/asfix2btf bgf/sdf.bgf - - wrappers/runbtfevaluator - - - - codesamples - - - - txl - - tools/txl2bgf fl/txl/FL.Txl - - - - - ecore - - tools/ecore2bgf fl/emf1/fl.ecore - - - - - ecore2 - - xsd - xsd2ecore - - - tools/ecore2bgf fl/emf2/model/fl.ecore - - - - - xsd - - tools/xsd2bgf fl/xsd/fl.xsd - - wrappers/runxsdparser - - wrappers/runxqueryevaluator - - - - tools/xml2btf fl/xsd/fl.xsd - - - - xmlsamples - - - - om - - tools/java2bgf fl/java1 types - - - - - jaxb - - xsd - xjc - - - tools/java2bgf fl/java3 fl - - - - - topdown - - dcg - - - antlr - - normalize-antlr-topdown - - - preferDcg-1 - preferDcg-2 - preferDcg-3 - preferDcg-4 - preferDcg-5 - preferDcg-6 - preferDcg-7 - preferDcg-8 - designateOps-1 - designateOps-2 - designateOps-3 - - - - - xframeworks - - sdf - - normalize-sdf-xframeworks - - - - txl - - normalize-txl-xframeworks - - - preferSdf-1 - preferSdf-2 - preferSdf-3 - preferSdf-4 - preferSdf-5 - preferSdf-6 - preferSdf-7 - designateOps-1 - designateOps-2 - designateOps-3 - - - multipleNewlines-1 - - - - - concrete - - topdown - - removeLayers-1 - removeLayers-2 - - - - xframeworks - - - - model - - ecore - - normalize-ecore-model - - - extractOps-1 - extractOps-2 - extractOps-3 - extractOps-4 - extractOps-5 - extractOps-6 - extractOps-7 - extractOps-8 - extractOps-9 - - - resolveAggregation-1 - - - - ecore2 - - normalize-ecore2-model - - - - xsd - - normalize-xsd-model - - - - - java - - jaxb - - normalize-jaxb-java - - - - om - - normalize-om-java - - - - - abstract - - java - - unerase-1 - unerase-2 - unerase-3 - unerase-4 - unerase-5 - unerase-6 - reroot-lower-1 - - - - model - - normalize-model-abstract - - - massage-model-1 - massage-model-2 - massage-model-3 - - - - - limit - - concrete - - reroot-lower-1 - defineLex-1 - defineLex-2 - defineLex-3 - defineLex-4 - stripTerminals-1 - stripTerminals-2 - stripTerminals-3 - stripTerminals-4 - stripTerminals-5 - stripTerminals-6 - stripNewline-1 - stripNewline-2 - permuteArgs-1 - - - - abstract - - makeSignature-1 - makeSignature-2 - makeSignature-3 - makeSignature-4 - makeSignature-5 - makeSignature-6 - makeSignature-7 - stripSelectors-1 - stripSelectors-2 - stripSelectors-3 - stripSelectors-4 - stripSelectors-5 - stripSelectors-6 - stripSelectors-7 - - - - diff --git a/topics/convergence/sliced/fl/.gitignore b/topics/convergence/sliced/fl/.gitignore new file mode 100644 index 00000000..f771108c --- /dev/null +++ b/topics/convergence/sliced/fl/.gitignore @@ -0,0 +1,7 @@ +TMP-res +architecture_* +*.log +*.txt +*~ +*.user +*.suo diff --git a/topics/convergence/sliced/fl/Makefile b/topics/convergence/sliced/fl/Makefile new file mode 100644 index 00000000..d8722699 --- /dev/null +++ b/topics/convergence/sliced/fl/Makefile @@ -0,0 +1,24 @@ +validator = ../../../../shared/tools/validate + +build: + time make slice + time make test + time make csv + +slice: + ../../../../shared/python/sliceXbgfs.py ../../xbgf/fl/fl.lcf . + +test: + ../../../../shared/tools/lci fl.lcf architecture + +csv: + ../../../../shared/python/lcf2csv.py fl.lcf ../../../../shared/tools/gdt csv + +check: + ${validator} lcf fl.lcf + ls -1 xbgf/*.xbgf | xargs -n1 ${validator} xbgf + ls -1 bgf/*.bgf | xargs -n1 ${validator} bgf + +clean: + rm -f *~ *.user *.suo *.log *.txt TMP-res architecture* bgf/* + rm -rf bin obj diff --git a/topics/convergence/fl/bgf/.gitignore b/topics/convergence/sliced/fl/bgf/.gitignore similarity index 100% rename from topics/convergence/fl/bgf/.gitignore rename to topics/convergence/sliced/fl/bgf/.gitignore diff --git a/topics/convergence/sliced/fl/fl.lcf b/topics/convergence/sliced/fl/fl.lcf new file mode 100644 index 00000000..3ec7e064 --- /dev/null +++ b/topics/convergence/sliced/fl/fl.lcf @@ -0,0 +1,193 @@ + + slps + ../../../.. + + + fl + slps/topics/fl + + + tools + slps/shared/tools + + + wrappers + slps/shared/wrappers + + + generators + slps/shared/generators + + + + tools/xbgf + tools/xbtf + + + tools/gdt + tools/tdt + + + tools/validate bgf + tools/validate btf + + + case + generators/casexbgf 3 + + + stript + generators/striptxbgf + + + strips + generators/stripsxbgf + + + reroot2top + generators/reroot2top + + + + antlr + + tools/antlr2bgf fl/java1/FL.g + + wrappers/runantlrparser + + wrappers/runantlrevaluator + + + + codesamples + + + + dcg + + tools/dcg2bgf fl/prolog1/Parser.pro + + wrappers/runprologparser + + wrappers/runprologevaluator + + + + codesamples + + + + sdf + + tools/sdf2bgf fl/asfsdf/*.sdf + + wrappers/runasfsdfparser + + wrappers/runasfsdfevaluator + + + + tools/asfix2btf bgf/sdf.bgf + + wrappers/runbtfevaluator + + + + codesamples + + + + rascal + + tools/rsc2bgf fl/rascal1/FL.rsc + + + + + txl + + tools/txl2bgf fl/txl/FL.Txl + + + + + ecore + + tools/ecore2bgf fl/emf1/fl.ecore + + + + + ecore2 + + xsd + xsd2ecore + + + tools/ecore2bgf fl/emf2/model/fl.ecore + + + + + xsd + + tools/xsd2bgf fl/xsd/fl.xsd + + wrappers/runxsdparser + + wrappers/runxqueryevaluator + + + + tools/xml2btf fl/xsd/fl.xsd + + + + xmlsamples + + + + jaxb + + xsd + xjc + + + tools/java2bgf fl/java3 fl + + + + + om + + tools/java2bgf fl/java1 types + + + + + topdown + dcg + antlr + normalize-antlr-topdownunchain-antlr-1unchain-antlr-2unchain-antlr-3unchain-antlr-4designate-antlr-1designate-antlr-2designate-antlr-3designate-antlr-4designate-antlr-5designate-antlr-6scannerless + rascal + multipleNewlines-rascal-1sdf + unlayered + topdown + removeLayers-1removeLayers-2scannerless + normalize-scannerless-unlayeredconcrete + unlayered + reroot-lower-1txl + normalize-txl-concretedesignate-txl-1designate-txl-2designate-txl-3designate-txl-4designate-txl-5designate-txl-6designate-txl-7designate-txl-8designate-txl-9designate-txl-10multipleNewlines-txl-1model + ecore + normalize-ecore-modelextractOps-1extractOps-2extractOps-3extractOps-4extractOps-5extractOps-6extractOps-7extractOps-8extractOps-9resolveAggregation-1ecore2 + normalize-ecore2-modelxsd + normalize-xsd-modeljava + jaxb + normalize-jaxb-javaom + normalize-om-javaabstract + java + unerase-1unerase-2unerase-3reroot-lower-1model + normalize-model-abstractmassage-model-1massage-model-2massage-model-3limit + concrete + defineLex-1defineLex-2defineLex-3defineLex-4stripTerminals-1stripTerminals-2stripTerminals-3stripTerminals-4stripTerminals-5stripTerminals-6stripNewline-1stripNewline-2permuteArgs-1abstract + makeSignature-1makeSignature-2makeSignature-3makeSignature-4makeSignature-5makeSignature-6makeSignature-7stripSelectors-1stripSelectors-2stripSelectors-3stripSelectors-4stripSelectors-5stripSelectors-6stripSelectors-7 \ No newline at end of file diff --git a/topics/convergence/fl/snapshot/.gitignore b/topics/convergence/sliced/fl/snapshot/.gitignore similarity index 100% rename from topics/convergence/fl/snapshot/.gitignore rename to topics/convergence/sliced/fl/snapshot/.gitignore diff --git a/topics/convergence/sliced/fl/xbgf/defineLex-1.xbgf b/topics/convergence/sliced/fl/xbgf/defineLex-1.xbgf new file mode 100644 index 00000000..4d914401 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/defineLex-1.xbgf @@ -0,0 +1,11 @@ + + + name + + string + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/defineLex-2.xbgf b/topics/convergence/sliced/fl/xbgf/defineLex-2.xbgf new file mode 100644 index 00000000..098470e6 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/defineLex-2.xbgf @@ -0,0 +1,9 @@ + + + int + + int + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/defineLex-3.xbgf b/topics/convergence/sliced/fl/xbgf/defineLex-3.xbgf new file mode 100644 index 00000000..ad0c49d2 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/defineLex-3.xbgf @@ -0,0 +1,2 @@ +name + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/defineLex-4.xbgf b/topics/convergence/sliced/fl/xbgf/defineLex-4.xbgf new file mode 100644 index 00000000..1004c9aa --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/defineLex-4.xbgf @@ -0,0 +1,2 @@ +int + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-antlr-1.xbgf b/topics/convergence/sliced/fl/xbgf/designate-antlr-1.xbgf new file mode 100644 index 00000000..634f7c27 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-antlr-1.xbgf @@ -0,0 +1,10 @@ + + + + atom + + int + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-antlr-2.xbgf b/topics/convergence/sliced/fl/xbgf/designate-antlr-2.xbgf new file mode 100644 index 00000000..0310d115 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-antlr-2.xbgf @@ -0,0 +1,10 @@ + + + + atom + + name + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-antlr-3.xbgf b/topics/convergence/sliced/fl/xbgf/designate-antlr-3.xbgf new file mode 100644 index 00000000..1db9900b --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-antlr-3.xbgf @@ -0,0 +1,4 @@ + + ops + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-antlr-4.xbgf b/topics/convergence/sliced/fl/xbgf/designate-antlr-4.xbgf new file mode 100644 index 00000000..c1b945ef --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-antlr-4.xbgf @@ -0,0 +1,10 @@ + + + + ops + + == + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-antlr-5.xbgf b/topics/convergence/sliced/fl/xbgf/designate-antlr-5.xbgf new file mode 100644 index 00000000..6d4e78c2 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-antlr-5.xbgf @@ -0,0 +1,10 @@ + + + + ops + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-antlr-6.xbgf b/topics/convergence/sliced/fl/xbgf/designate-antlr-6.xbgf new file mode 100644 index 00000000..fe6f2233 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-antlr-6.xbgf @@ -0,0 +1,10 @@ + + + + ops + + - + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-txl-1.xbgf b/topics/convergence/sliced/fl/xbgf/designate-txl-1.xbgf new file mode 100644 index 00000000..aa9cfe27 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-txl-1.xbgf @@ -0,0 +1,4 @@ + + expr + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-txl-10.xbgf b/topics/convergence/sliced/fl/xbgf/designate-txl-10.xbgf new file mode 100644 index 00000000..fe6f2233 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-txl-10.xbgf @@ -0,0 +1,10 @@ + + + + ops + + - + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-txl-2.xbgf b/topics/convergence/sliced/fl/xbgf/designate-txl-2.xbgf new file mode 100644 index 00000000..4fed6976 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-txl-2.xbgf @@ -0,0 +1,10 @@ + + + + expr + + int + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-txl-3.xbgf b/topics/convergence/sliced/fl/xbgf/designate-txl-3.xbgf new file mode 100644 index 00000000..ad0a199f --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-txl-3.xbgf @@ -0,0 +1,10 @@ + + + + expr + + name + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-txl-4.xbgf b/topics/convergence/sliced/fl/xbgf/designate-txl-4.xbgf new file mode 100644 index 00000000..126e8361 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-txl-4.xbgf @@ -0,0 +1,29 @@ + + + + expr + + + + if + + + expr + + + then + + + expr + + + else + + + expr + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-txl-5.xbgf b/topics/convergence/sliced/fl/xbgf/designate-txl-5.xbgf new file mode 100644 index 00000000..b6318667 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-txl-5.xbgf @@ -0,0 +1,21 @@ + + + + expr + + + + name + + + + + expr + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-txl-6.xbgf b/topics/convergence/sliced/fl/xbgf/designate-txl-6.xbgf new file mode 100644 index 00000000..4e43bf10 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-txl-6.xbgf @@ -0,0 +1,20 @@ + + + + expr + + + + expr + + + ops + + + expr + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-txl-7.xbgf b/topics/convergence/sliced/fl/xbgf/designate-txl-7.xbgf new file mode 100644 index 00000000..1db9900b --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-txl-7.xbgf @@ -0,0 +1,4 @@ + + ops + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-txl-8.xbgf b/topics/convergence/sliced/fl/xbgf/designate-txl-8.xbgf new file mode 100644 index 00000000..c1b945ef --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-txl-8.xbgf @@ -0,0 +1,10 @@ + + + + ops + + == + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/designate-txl-9.xbgf b/topics/convergence/sliced/fl/xbgf/designate-txl-9.xbgf new file mode 100644 index 00000000..6d4e78c2 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/designate-txl-9.xbgf @@ -0,0 +1,10 @@ + + + + ops + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/extractOps-1.xbgf b/topics/convergence/sliced/fl/xbgf/extractOps-1.xbgf new file mode 100644 index 00000000..5239abbe --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/extractOps-1.xbgf @@ -0,0 +1,54 @@ + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + + + + Plus + + + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + PlusExp + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/extractOps-2.xbgf b/topics/convergence/sliced/fl/xbgf/extractOps-2.xbgf new file mode 100644 index 00000000..0ed2650a --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/extractOps-2.xbgf @@ -0,0 +1,54 @@ + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + + + + Minus + + + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + MinusExp + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/extractOps-3.xbgf b/topics/convergence/sliced/fl/xbgf/extractOps-3.xbgf new file mode 100644 index 00000000..6492a155 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/extractOps-3.xbgf @@ -0,0 +1,54 @@ + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + + + + Equal + + + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + EqualExp + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/extractOps-4.xbgf b/topics/convergence/sliced/fl/xbgf/extractOps-4.xbgf new file mode 100644 index 00000000..3f43661f --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/extractOps-4.xbgf @@ -0,0 +1,2 @@ +PlusExp + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/extractOps-5.xbgf b/topics/convergence/sliced/fl/xbgf/extractOps-5.xbgf new file mode 100644 index 00000000..4ed98bc7 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/extractOps-5.xbgf @@ -0,0 +1,2 @@ +MinusExp + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/extractOps-6.xbgf b/topics/convergence/sliced/fl/xbgf/extractOps-6.xbgf new file mode 100644 index 00000000..a132411f --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/extractOps-6.xbgf @@ -0,0 +1,2 @@ +EqualExp + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/extractOps-7.xbgf b/topics/convergence/sliced/fl/xbgf/extractOps-7.xbgf new file mode 100644 index 00000000..8d89dc8a --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/extractOps-7.xbgf @@ -0,0 +1,139 @@ + + + + + + + + Plus + + + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + + + + Minus + + + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + + + + Equal + + + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + + + + + + + + Plus + + + + + + + + Minus + + + + + + + + Equal + + + + + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/extractOps-8.xbgf b/topics/convergence/sliced/fl/xbgf/extractOps-8.xbgf new file mode 100644 index 00000000..eb7f2682 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/extractOps-8.xbgf @@ -0,0 +1,34 @@ + + + Ops + + + + + Plus + + + + + + + + Minus + + + + + + + + Equal + + + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/extractOps-9.xbgf b/topics/convergence/sliced/fl/xbgf/extractOps-9.xbgf new file mode 100644 index 00000000..2db5d6dc --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/extractOps-9.xbgf @@ -0,0 +1,39 @@ + + + Binary + + + + + + + ops + + Ops + + + + + + + + left + + Expr + + + + + + right + + Expr + + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/makeSignature-1.xbgf b/topics/convergence/sliced/fl/xbgf/makeSignature-1.xbgf new file mode 100644 index 00000000..daa60d5c --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/makeSignature-1.xbgf @@ -0,0 +1,4 @@ + + expr + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/makeSignature-2.xbgf b/topics/convergence/sliced/fl/xbgf/makeSignature-2.xbgf new file mode 100644 index 00000000..70939b8b --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/makeSignature-2.xbgf @@ -0,0 +1,9 @@ + + + expr + + literal + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/makeSignature-3.xbgf b/topics/convergence/sliced/fl/xbgf/makeSignature-3.xbgf new file mode 100644 index 00000000..45fe00ad --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/makeSignature-3.xbgf @@ -0,0 +1,9 @@ + + + expr + + argument + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/makeSignature-4.xbgf b/topics/convergence/sliced/fl/xbgf/makeSignature-4.xbgf new file mode 100644 index 00000000..b887e2c6 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/makeSignature-4.xbgf @@ -0,0 +1,9 @@ + + + expr + + binary + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/makeSignature-5.xbgf b/topics/convergence/sliced/fl/xbgf/makeSignature-5.xbgf new file mode 100644 index 00000000..a755ebaa --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/makeSignature-5.xbgf @@ -0,0 +1,9 @@ + + + expr + + ifThenElse + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/makeSignature-6.xbgf b/topics/convergence/sliced/fl/xbgf/makeSignature-6.xbgf new file mode 100644 index 00000000..1814e4fd --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/makeSignature-6.xbgf @@ -0,0 +1,9 @@ + + + expr + + apply + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/makeSignature-7.xbgf b/topics/convergence/sliced/fl/xbgf/makeSignature-7.xbgf new file mode 100644 index 00000000..ce5783f7 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/makeSignature-7.xbgf @@ -0,0 +1,5 @@ + + ops + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/massage-model-1.xbgf b/topics/convergence/sliced/fl/xbgf/massage-model-1.xbgf new file mode 100644 index 00000000..5ee7522a --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/massage-model-1.xbgf @@ -0,0 +1,31 @@ + + + + + + function + + function + + + + + + + + function + + + + function + + + + + + + program + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/massage-model-2.xbgf b/topics/convergence/sliced/fl/xbgf/massage-model-2.xbgf new file mode 100644 index 00000000..64972746 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/massage-model-2.xbgf @@ -0,0 +1,31 @@ + + + + + + arg + + string + + + + + + + + arg + + + + string + + + + + + + function + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/massage-model-3.xbgf b/topics/convergence/sliced/fl/xbgf/massage-model-3.xbgf new file mode 100644 index 00000000..338300bb --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/massage-model-3.xbgf @@ -0,0 +1,31 @@ + + + + + + arg + + expr + + + + + + + + arg + + + + expr + + + + + + + apply + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/multipleNewlines-rascal-1.xbgf b/topics/convergence/sliced/fl/xbgf/multipleNewlines-rascal-1.xbgf new file mode 100644 index 00000000..d90272fb --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/multipleNewlines-rascal-1.xbgf @@ -0,0 +1,16 @@ + + + Newline + + + + + Newline + + + + + Function + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/multipleNewlines-txl-1.xbgf b/topics/convergence/sliced/fl/xbgf/multipleNewlines-txl-1.xbgf new file mode 100644 index 00000000..318603db --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/multipleNewlines-txl-1.xbgf @@ -0,0 +1,16 @@ + + + newline + + + + + newline + + + + + function + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/normalize-antlr-topdown.xbgf b/topics/convergence/sliced/fl/xbgf/normalize-antlr-topdown.xbgf new file mode 100644 index 00000000..d4762fc2 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/normalize-antlr-topdown.xbgf @@ -0,0 +1,291 @@ + + + program + + + + + + + f + + function + + + + + + + + + + + + function + + + + + + + n + + ID + + + + + + + + + + + + a + + ID + + + + + + + + + = + + + + + + e + + expr + + + + + + + + + NEWLINE + + + + + + + + + + binary + + + + + + + l + + atom + + + + + + + + + + + + + + o + + ops + + + + + + + + + + r + + atom + + + + + + + + + + + + + + + + apply + + + + + + + i + + ID + + + + + + + + + + + + a + + atom + + + + + + + + + + + + + + ifThenElse + + + + if + + + + + + c + + expr + + + + + + + then + + + + + + e1 + + expr + + + + + + + else + + + + + + e2 + + expr + + + + + + + + + + + atom + + + + atom + + + + ( + + + + + + e + + expr + + + + + + + ) + + + + + + + + NEWLINE + newline + + + + + ID + name + + + + + INT + int + + + + + b + binary + + + + + a + apply + + + + + i + ifThenElse + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/normalize-ecore-model.xbgf b/topics/convergence/sliced/fl/xbgf/normalize-ecore-model.xbgf new file mode 100644 index 00000000..7dc2d1ab --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/normalize-ecore-model.xbgf @@ -0,0 +1,131 @@ + + + LiteralExp + Literal + + + + + IfThenElseExp + IfThenElse + + + + + ApplyExp + Apply + + + + + + BinaryExp + Binary + + + + + Exp + Expr + + + + + + value + info + + + + + argument + arg + + + + + definition + rhs + + + + + if + ifExpr + + + + + then + thenExpr + + + + + else + elseExpr + + + + + + Argument + + + + + name + + string + + + + + + + + Argument + + + ArgumentExp + Argument + + + + + + + Argument + + + + + arg + + string + + + + + + + + + + Argument + + + + + name + + string + + + + + + + + +Program \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/normalize-ecore2-model.xbgf b/topics/convergence/sliced/fl/xbgf/normalize-ecore2-model.xbgf new file mode 100644 index 00000000..5f681850 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/normalize-ecore2-model.xbgf @@ -0,0 +1,7 @@ + + + ProgramType + Program + + +Program \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/normalize-jaxb-java.xbgf b/topics/convergence/sliced/fl/xbgf/normalize-jaxb-java.xbgf new file mode 100644 index 00000000..7a4e69dc --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/normalize-jaxb-java.xbgf @@ -0,0 +1,145 @@ + + ObjectFactory + + + package-info + + + + EQUAL + equal + + + + + PLUS + plus + + + + + MINUS + minus + + + + + Program + program + + + + + Expr + expr + + + + + Ops + ops + + + + + Apply + apply + + + + + Argument + argument + + + + + Binary + binary + + + + + IfThenElse + ifThenElse + + + + + Literal + literal + + + + + Function + function + + + + + Name + name + + + + + Arg + arg + + + + + Ops + ops + + + + + Left + left + + + + + Right + right + + + + + Rhs + rhs + + + + + IfExpr + ifExpr + + + + + ThenExpr + thenExpr + + + + + ElseExpr + elseExpr + + + + + Info + info + + + + + Function + function + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/normalize-model-abstract.xbgf b/topics/convergence/sliced/fl/xbgf/normalize-model-abstract.xbgf new file mode 100644 index 00000000..7908fbe6 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/normalize-model-abstract.xbgf @@ -0,0 +1,73 @@ + + + Program + program + + + + + Function + function + + + + + Expr + expr + + + + + Literal + literal + + + + + Argument + argument + + + + + IfThenElse + ifThenElse + + + + + Apply + apply + + + + + Binary + binary + + + + + Ops + ops + + + + + Plus + plus + + + + + Minus + minus + + + + + Equal + equal + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/normalize-om-java.xbgf b/topics/convergence/sliced/fl/xbgf/normalize-om-java.xbgf new file mode 100644 index 00000000..01acb147 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/normalize-om-java.xbgf @@ -0,0 +1,88 @@ + + Visitor + + + + Program + program + + + + + Expr + expr + + + + + Ops + ops + + + + + Apply + apply + + + + + Argument + argument + + + + + Binary + binary + + + + + IfThenElse + ifThenElse + + + + + Literal + literal + + + + + Function + function + + + + + Equal + equal + + + + + Plus + plus + + + + + Minus + minus + + + + + args + arg + + + + + functions + function + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/normalize-scannerless-unlayered.xbgf b/topics/convergence/sliced/fl/xbgf/normalize-scannerless-unlayered.xbgf new file mode 100644 index 00000000..4b0ee634 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/normalize-scannerless-unlayered.xbgf @@ -0,0 +1,43 @@ + + + Program + program + + + + + Function + function + + + + + Name + name + + + + + Expr + expr + + + + + Newline + newline + + + + + Ops + ops + + + + + Int + int + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/normalize-txl-concrete.xbgf b/topics/convergence/sliced/fl/xbgf/normalize-txl-concrete.xbgf new file mode 100644 index 00000000..1fab5ea3 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/normalize-txl-concrete.xbgf @@ -0,0 +1,31 @@ + + + fun + function + + + + + expression + expr + + + + + op + ops + + + + + id + name + + + + + number + int + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/normalize-xsd-model.xbgf b/topics/convergence/sliced/fl/xbgf/normalize-xsd-model.xbgf new file mode 100644 index 00000000..10f55e94 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/normalize-xsd-model.xbgf @@ -0,0 +1,4 @@ + + Fragment + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/permuteArgs-1.xbgf b/topics/convergence/sliced/fl/xbgf/permuteArgs-1.xbgf new file mode 100644 index 00000000..23d4d943 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/permuteArgs-1.xbgf @@ -0,0 +1,20 @@ + + + + expr + + + + ops + + + expr + + + expr + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/removeLayers-1.xbgf b/topics/convergence/sliced/fl/xbgf/removeLayers-1.xbgf new file mode 100644 index 00000000..8cdf9421 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/removeLayers-1.xbgf @@ -0,0 +1,5 @@ + + atom + expr + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/removeLayers-2.xbgf b/topics/convergence/sliced/fl/xbgf/removeLayers-2.xbgf new file mode 100644 index 00000000..a816db29 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/removeLayers-2.xbgf @@ -0,0 +1,20 @@ + + + + expr + + + + expr + + + ops + + + expr + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/reroot-lower-1.xbgf b/topics/convergence/sliced/fl/xbgf/reroot-lower-1.xbgf new file mode 100644 index 00000000..4bc742c6 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/reroot-lower-1.xbgf @@ -0,0 +1 @@ +program \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/resolveAggregation-1.xbgf b/topics/convergence/sliced/fl/xbgf/resolveAggregation-1.xbgf new file mode 100644 index 00000000..7a505cac --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/resolveAggregation-1.xbgf @@ -0,0 +1,22 @@ + + + + function + + Function + + + + + + name + + string + + + + + Apply + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripNewline-1.xbgf b/topics/convergence/sliced/fl/xbgf/stripNewline-1.xbgf new file mode 100644 index 00000000..1ac96cc3 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripNewline-1.xbgf @@ -0,0 +1,39 @@ + + + function + + + + string + + + + + string + + + + + expr + + + + + + + + + newline + + + + + + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripNewline-2.xbgf b/topics/convergence/sliced/fl/xbgf/stripNewline-2.xbgf new file mode 100644 index 00000000..ebb08c1e --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripNewline-2.xbgf @@ -0,0 +1,10 @@ + + + expr + + expr + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripSelectors-1.xbgf b/topics/convergence/sliced/fl/xbgf/stripSelectors-1.xbgf new file mode 100644 index 00000000..891261af --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripSelectors-1.xbgf @@ -0,0 +1,39 @@ + + + + expr + + + + + + + name + + string + + + + + + + + + + arg + + + + expr + + + + + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripSelectors-2.xbgf b/topics/convergence/sliced/fl/xbgf/stripSelectors-2.xbgf new file mode 100644 index 00000000..1ebe33cc --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripSelectors-2.xbgf @@ -0,0 +1,19 @@ + + + + expr + + + + + name + + string + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripSelectors-3.xbgf b/topics/convergence/sliced/fl/xbgf/stripSelectors-3.xbgf new file mode 100644 index 00000000..cb0f3a18 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripSelectors-3.xbgf @@ -0,0 +1,47 @@ + + + + expr + + + + + + + ops + + ops + + + + + + + + + + left + + expr + + + + + + + + + + right + + expr + + + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripSelectors-4.xbgf b/topics/convergence/sliced/fl/xbgf/stripSelectors-4.xbgf new file mode 100644 index 00000000..618cec5f --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripSelectors-4.xbgf @@ -0,0 +1,47 @@ + + + + expr + + + + + + + ifExpr + + expr + + + + + + + + + + thenExpr + + expr + + + + + + + + + + elseExpr + + expr + + + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripSelectors-5.xbgf b/topics/convergence/sliced/fl/xbgf/stripSelectors-5.xbgf new file mode 100644 index 00000000..79cb2afb --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripSelectors-5.xbgf @@ -0,0 +1,19 @@ + + + + expr + + + + + info + + int + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripSelectors-6.xbgf b/topics/convergence/sliced/fl/xbgf/stripSelectors-6.xbgf new file mode 100644 index 00000000..14ebc428 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripSelectors-6.xbgf @@ -0,0 +1,50 @@ + + + function + + + + + + + name + + string + + + + + + + + + + arg + + + + string + + + + + + + + + + + + rhs + + expr + + + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripSelectors-7.xbgf b/topics/convergence/sliced/fl/xbgf/stripSelectors-7.xbgf new file mode 100644 index 00000000..c01db602 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripSelectors-7.xbgf @@ -0,0 +1,22 @@ + + + program + + + + + function + + + + function + + + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripTerminals-1.xbgf b/topics/convergence/sliced/fl/xbgf/stripTerminals-1.xbgf new file mode 100644 index 00000000..c3872dd5 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripTerminals-1.xbgf @@ -0,0 +1,37 @@ + + + function + + + + string + + + + + string + + + + + + + = + + + + + expr + + + + + newline + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripTerminals-2.xbgf b/topics/convergence/sliced/fl/xbgf/stripTerminals-2.xbgf new file mode 100644 index 00000000..499e9c4b --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripTerminals-2.xbgf @@ -0,0 +1,41 @@ + + + + expr + + + + + + if + + + + + expr + + + + + then + + + + + expr + + + + + else + + + + + expr + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripTerminals-3.xbgf b/topics/convergence/sliced/fl/xbgf/stripTerminals-3.xbgf new file mode 100644 index 00000000..8b1f9a16 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripTerminals-3.xbgf @@ -0,0 +1,27 @@ + + + expr + + + + + + ( + + + + + expr + + + + + ) + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripTerminals-4.xbgf b/topics/convergence/sliced/fl/xbgf/stripTerminals-4.xbgf new file mode 100644 index 00000000..97a3aeb2 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripTerminals-4.xbgf @@ -0,0 +1,14 @@ + + + + ops + + + + == + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripTerminals-5.xbgf b/topics/convergence/sliced/fl/xbgf/stripTerminals-5.xbgf new file mode 100644 index 00000000..907aebd5 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripTerminals-5.xbgf @@ -0,0 +1,14 @@ + + + + ops + + + + + + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/stripTerminals-6.xbgf b/topics/convergence/sliced/fl/xbgf/stripTerminals-6.xbgf new file mode 100644 index 00000000..ebbffeed --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/stripTerminals-6.xbgf @@ -0,0 +1,14 @@ + + + + ops + + + + - + + + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/unchain-antlr-1.xbgf b/topics/convergence/sliced/fl/xbgf/unchain-antlr-1.xbgf new file mode 100644 index 00000000..aa9cfe27 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/unchain-antlr-1.xbgf @@ -0,0 +1,4 @@ + + expr + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/unchain-antlr-2.xbgf b/topics/convergence/sliced/fl/xbgf/unchain-antlr-2.xbgf new file mode 100644 index 00000000..a88b818a --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/unchain-antlr-2.xbgf @@ -0,0 +1,10 @@ + + + + expr + + apply + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/unchain-antlr-3.xbgf b/topics/convergence/sliced/fl/xbgf/unchain-antlr-3.xbgf new file mode 100644 index 00000000..a15d430e --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/unchain-antlr-3.xbgf @@ -0,0 +1,10 @@ + + + + expr + + binary + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/unchain-antlr-4.xbgf b/topics/convergence/sliced/fl/xbgf/unchain-antlr-4.xbgf new file mode 100644 index 00000000..a90d3faf --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/unchain-antlr-4.xbgf @@ -0,0 +1,10 @@ + + + + expr + + ifThenElse + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/unerase-1.xbgf b/topics/convergence/sliced/fl/xbgf/unerase-1.xbgf new file mode 100644 index 00000000..d63665ef --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/unerase-1.xbgf @@ -0,0 +1,21 @@ + + + + + function + + + + + + + function + + + + + program + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/unerase-2.xbgf b/topics/convergence/sliced/fl/xbgf/unerase-2.xbgf new file mode 100644 index 00000000..88636ff2 --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/unerase-2.xbgf @@ -0,0 +1,21 @@ + + + + + string + + + + + + + string + + + + + function + + + + \ No newline at end of file diff --git a/topics/convergence/sliced/fl/xbgf/unerase-3.xbgf b/topics/convergence/sliced/fl/xbgf/unerase-3.xbgf new file mode 100644 index 00000000..856588bc --- /dev/null +++ b/topics/convergence/sliced/fl/xbgf/unerase-3.xbgf @@ -0,0 +1,20 @@ + + + + + expr + + + + + + + expr + + + + + apply + + + \ No newline at end of file diff --git a/topics/convergence/java-sliced/Makefile b/topics/convergence/sliced/java/Makefile similarity index 100% rename from topics/convergence/java-sliced/Makefile rename to topics/convergence/sliced/java/Makefile diff --git a/topics/convergence/java-sliced/java.lcf b/topics/convergence/sliced/java/java.lcf similarity index 100% rename from topics/convergence/java-sliced/java.lcf rename to topics/convergence/sliced/java/java.lcf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-1.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-1.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-10.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-10.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-11.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-11.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-12.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-12.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-13.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-13.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-14.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-14.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-2.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-2.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-3.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-3.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-4.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-4.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-5.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-5.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-6.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-6.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-7.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-7.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-8.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-8.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-9.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyModifiers-read2-9.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyModifiers-read2-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyStatements-1.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyStatements-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyStatements-1.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyStatements-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyStatements-2.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyStatements-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyStatements-2.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyStatements-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyStatements-3.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyStatements-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyStatements-3.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyStatements-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyStatements-4.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyStatements-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyStatements-4.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyStatements-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyStatements-5.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyStatements-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyStatements-5.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyStatements-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/deyaccifyStatements-6.xbgf b/topics/convergence/sliced/java/xbgf/deyaccifyStatements-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/deyaccifyStatements-6.xbgf rename to topics/convergence/sliced/java/xbgf/deyaccifyStatements-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-1.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-1.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-10.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-10.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-11.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-11.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-12.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-12.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-13.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-13.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-14.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-14.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-2.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-2.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-3.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-3.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-4.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-4.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-5.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-5.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-6.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-6.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-7.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-7.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-8.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-8.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read1-9.xbgf b/topics/convergence/sliced/java/xbgf/edit-read1-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read1-9.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read1-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-1.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-1.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-10.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-10.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-11.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-11.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-12.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-12.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-13.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-13.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-14.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-14.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-15.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-15.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-16.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-16.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-17.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-17.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-18.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-18.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-19.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-19.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-2.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-2.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-20.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-20.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-21.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-21.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-22.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-22.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-23.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-23.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-24.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-24.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-25.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-25.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-26.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-26.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-27.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-27.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-28.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-28.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-29.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-29.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-3.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-3.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-30.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-30.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-31.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-31.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-32.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-32.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-33.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-33.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-4.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-4.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-5.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-5.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-6.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-6.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-7.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-7.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-8.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-8.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read2-9.xbgf b/topics/convergence/sliced/java/xbgf/edit-read2-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read2-9.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read2-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read3-1.xbgf b/topics/convergence/sliced/java/xbgf/edit-read3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read3-1.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read3-2.xbgf b/topics/convergence/sliced/java/xbgf/edit-read3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read3-2.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read3-3.xbgf b/topics/convergence/sliced/java/xbgf/edit-read3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read3-3.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read3-4.xbgf b/topics/convergence/sliced/java/xbgf/edit-read3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read3-4.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read3-5.xbgf b/topics/convergence/sliced/java/xbgf/edit-read3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read3-5.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/edit-read3-6.xbgf b/topics/convergence/sliced/java/xbgf/edit-read3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/edit-read3-6.xbgf rename to topics/convergence/sliced/java/xbgf/edit-read3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-1.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-1.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-10.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-10.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-100.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-100.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-100.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-100.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-11.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-11.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-12.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-12.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-13.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-13.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-14.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-14.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-15.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-15.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-16.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-16.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-17.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-17.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-18.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-18.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-19.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-19.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-2.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-2.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-20.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-20.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-21.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-21.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-22.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-22.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-23.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-23.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-24.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-24.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-25.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-25.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-26.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-26.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-27.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-27.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-28.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-28.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-29.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-29.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-3.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-3.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-30.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-30.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-31.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-31.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-32.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-32.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-33.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-33.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-34.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-34.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-35.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-35.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-36.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-36.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-37.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-37.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-38.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-38.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-38.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-38.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-39.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-39.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-39.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-39.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-4.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-4.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-40.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-40.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-40.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-40.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-41.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-41.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-41.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-41.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-42.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-42.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-42.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-42.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-43.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-43.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-43.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-43.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-44.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-44.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-44.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-44.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-45.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-45.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-45.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-45.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-46.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-46.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-46.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-46.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-47.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-47.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-47.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-47.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-48.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-48.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-48.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-48.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-49.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-49.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-49.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-49.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-5.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-5.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-50.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-50.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-50.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-50.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-51.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-51.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-51.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-51.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-52.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-52.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-52.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-52.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-53.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-53.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-53.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-53.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-54.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-54.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-54.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-54.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-55.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-55.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-55.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-55.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-56.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-56.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-56.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-56.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-57.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-57.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-57.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-57.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-58.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-58.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-58.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-58.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-59.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-59.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-59.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-59.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-6.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-6.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-60.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-60.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-60.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-60.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-61.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-61.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-61.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-61.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-62.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-62.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-62.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-62.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-63.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-63.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-63.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-63.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-64.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-64.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-64.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-64.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-65.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-65.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-65.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-65.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-66.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-66.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-66.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-66.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-67.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-67.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-67.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-67.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-68.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-68.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-68.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-68.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-69.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-69.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-69.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-69.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-7.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-7.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-70.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-70.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-70.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-70.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-71.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-71.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-71.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-71.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-72.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-72.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-72.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-72.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-73.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-73.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-73.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-73.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-74.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-74.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-74.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-74.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-75.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-75.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-75.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-75.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-76.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-76.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-76.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-76.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-77.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-77.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-77.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-77.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-78.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-78.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-78.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-78.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-79.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-79.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-79.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-79.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-8.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-8.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-80.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-80.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-80.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-80.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-81.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-81.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-81.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-81.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-82.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-82.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-82.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-82.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-83.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-83.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-83.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-83.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-84.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-84.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-84.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-84.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-85.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-85.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-85.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-85.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-86.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-86.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-86.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-86.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-87.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-87.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-87.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-87.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-88.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-88.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-88.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-88.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-89.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-89.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-89.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-89.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-9.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-9.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-90.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-90.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-90.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-90.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-91.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-91.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-91.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-91.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-92.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-92.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-92.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-92.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-93.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-93.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-93.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-93.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-94.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-94.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-94.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-94.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-95.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-95.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-95.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-95.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-96.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-96.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-96.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-96.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-97.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-97.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-97.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-97.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-98.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-98.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-98.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-98.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editDeclarations-99.xbgf b/topics/convergence/sliced/java/xbgf/editDeclarations-99.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editDeclarations-99.xbgf rename to topics/convergence/sliced/java/xbgf/editDeclarations-99.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-1.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-1.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-10.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-10.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-11.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-11.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-12.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-12.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-13.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-13.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-14.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-14.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-15.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-15.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-16.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-16.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-17.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-17.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-18.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-18.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-19.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-19.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-2.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-2.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-20.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-20.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-21.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-21.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-22.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-22.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-23.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-23.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-24.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-24.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-25.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-25.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-26.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-26.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-27.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-27.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-28.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-28.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-29.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-29.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-3.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-3.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-30.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-30.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-31.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-31.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-32.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-32.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-33.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-33.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-34.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-34.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-35.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-35.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-36.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-36.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-37.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-37.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-38.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-38.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-38.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-38.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-39.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-39.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-39.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-39.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-4.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-4.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-40.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-40.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-40.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-40.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-5.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-5.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-6.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-6.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-7.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-7.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-8.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-8.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-jls1-9.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-jls1-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-jls1-9.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-jls1-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-1.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-1.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-10.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-10.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-11.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-11.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-12.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-12.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-13.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-13.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-14.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-14.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-15.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-15.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-16.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-16.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-17.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-17.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-18.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-18.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-19.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-19.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-2.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-2.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-20.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-20.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-3.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-3.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-4.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-4.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-5.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-5.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-6.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-6.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-7.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-7.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-8.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-8.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read2-9.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read2-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read2-9.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read2-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-1.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-1.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-10.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-10.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-11.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-11.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-12.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-12.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-13.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-13.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-14.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-14.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-15.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-15.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-16.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-16.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-17.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-17.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-18.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-18.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-19.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-19.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-2.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-2.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-20.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-20.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-21.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-21.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-22.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-22.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-23.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-23.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-24.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-24.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-25.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-25.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-26.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-26.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-27.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-27.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-28.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-28.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-29.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-29.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-3.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-3.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-30.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-30.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-31.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-31.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-32.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-32.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-33.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-33.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-34.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-34.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-35.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-35.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-36.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-36.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-37.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-37.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-38.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-38.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-38.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-38.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-39.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-39.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-39.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-39.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-4.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-4.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-40.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-40.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-40.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-40.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-41.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-41.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-41.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-41.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-42.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-42.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-42.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-42.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-43.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-43.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-43.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-43.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-44.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-44.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-44.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-44.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-45.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-45.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-45.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-45.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-46.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-46.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-46.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-46.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-47.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-47.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-47.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-47.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-48.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-48.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-48.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-48.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-49.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-49.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-49.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-49.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-5.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-5.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-50.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-50.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-50.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-50.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-51.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-51.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-51.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-51.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-52.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-52.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-52.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-52.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-53.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-53.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-53.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-53.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-54.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-54.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-54.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-54.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-55.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-55.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-55.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-55.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-56.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-56.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-56.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-56.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-57.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-57.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-57.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-57.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-58.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-58.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-58.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-58.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-59.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-59.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-59.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-59.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-6.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-6.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-60.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-60.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-60.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-60.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-7.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-7.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-8.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-8.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/editExpressions-read3-9.xbgf b/topics/convergence/sliced/java/xbgf/editExpressions-read3-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/editExpressions-read3-9.xbgf rename to topics/convergence/sliced/java/xbgf/editExpressions-read3-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/eliminate-read2-1.xbgf b/topics/convergence/sliced/java/xbgf/eliminate-read2-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/eliminate-read2-1.xbgf rename to topics/convergence/sliced/java/xbgf/eliminate-read2-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/eliminate-read2-2.xbgf b/topics/convergence/sliced/java/xbgf/eliminate-read2-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/eliminate-read2-2.xbgf rename to topics/convergence/sliced/java/xbgf/eliminate-read2-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/eliminate-read2-3.xbgf b/topics/convergence/sliced/java/xbgf/eliminate-read2-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/eliminate-read2-3.xbgf rename to topics/convergence/sliced/java/xbgf/eliminate-read2-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-jls1-1.xbgf b/topics/convergence/sliced/java/xbgf/extend-jls1-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-jls1-1.xbgf rename to topics/convergence/sliced/java/xbgf/extend-jls1-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-jls1-2.xbgf b/topics/convergence/sliced/java/xbgf/extend-jls1-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-jls1-2.xbgf rename to topics/convergence/sliced/java/xbgf/extend-jls1-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-jls1-3.xbgf b/topics/convergence/sliced/java/xbgf/extend-jls1-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-jls1-3.xbgf rename to topics/convergence/sliced/java/xbgf/extend-jls1-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-jls1-4.xbgf b/topics/convergence/sliced/java/xbgf/extend-jls1-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-jls1-4.xbgf rename to topics/convergence/sliced/java/xbgf/extend-jls1-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-jls1-5.xbgf b/topics/convergence/sliced/java/xbgf/extend-jls1-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-jls1-5.xbgf rename to topics/convergence/sliced/java/xbgf/extend-jls1-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-1.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-1.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-10.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-10.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-11.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-11.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-12.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-12.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-13.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-13.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-14.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-14.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-15.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-15.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-16.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-16.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-17.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-17.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-18.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-18.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-19.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-19.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-2.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-2.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-20.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-20.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-21.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-21.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-22.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-22.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-23.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-23.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-24.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-24.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-25.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-25.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-26.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-26.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-27.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-27.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-28.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-28.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-29.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-29.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-3.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-3.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-30.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-30.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-4.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-4.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-5.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-5.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-6.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-6.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-7.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-7.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-8.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-8.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read1-9.xbgf b/topics/convergence/sliced/java/xbgf/extend-read1-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read1-9.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read1-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-1.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-1.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-10.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-10.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-11.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-11.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-12.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-12.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-13.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-13.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-14.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-14.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-15.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-15.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-16.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-16.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-17.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-17.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-18.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-18.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-19.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-19.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-2.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-2.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-20.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-20.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-21.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-21.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-22.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-22.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-23.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-23.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-24.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-24.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-25.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-25.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-26.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-26.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-27.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-27.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-28.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-28.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-29.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-29.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-3.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-3.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-30.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-30.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-31.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-31.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-32.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-32.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-33.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-33.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-34.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-34.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-35.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-35.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-36.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-36.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-37.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-37.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-38.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-38.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-38.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-38.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-39.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-39.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-39.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-39.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-4.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-4.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-40.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-40.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-40.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-40.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-41.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-41.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-41.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-41.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-42.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-42.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-42.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-42.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-43.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-43.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-43.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-43.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-44.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-44.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-44.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-44.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-45.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-45.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-45.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-45.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-46.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-46.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-46.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-46.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-47.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-47.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-47.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-47.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-48.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-48.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-48.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-48.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-49.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-49.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-49.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-49.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-5.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-5.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-50.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-50.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-50.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-50.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-51.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-51.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-51.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-51.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-52.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-52.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-52.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-52.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-53.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-53.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-53.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-53.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-54.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-54.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-54.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-54.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-55.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-55.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-55.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-55.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-56.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-56.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-56.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-56.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-57.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-57.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-57.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-57.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-58.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-58.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-58.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-58.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-59.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-59.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-59.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-59.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-6.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-6.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-60.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-60.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-60.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-60.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-61.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-61.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-61.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-61.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-62.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-62.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-62.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-62.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-63.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-63.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-63.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-63.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-64.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-64.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-64.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-64.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-65.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-65.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-65.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-65.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-66.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-66.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-66.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-66.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-67.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-67.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-67.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-67.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-68.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-68.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-68.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-68.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-69.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-69.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-69.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-69.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-7.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-7.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-70.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-70.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-70.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-70.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-71.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-71.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-71.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-71.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-72.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-72.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-72.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-72.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-73.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-73.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-73.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-73.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-74.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-74.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-74.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-74.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-75.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-75.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-75.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-75.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-76.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-76.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-76.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-76.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-77.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-77.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-77.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-77.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-78.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-78.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-78.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-78.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-79.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-79.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-79.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-79.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-8.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-8.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-80.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-80.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-80.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-80.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-81.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-81.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-81.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-81.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-82.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-82.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-82.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-82.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-83.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-83.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-83.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-83.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extend-read12-9.xbgf b/topics/convergence/sliced/java/xbgf/extend-read12-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extend-read12-9.xbgf rename to topics/convergence/sliced/java/xbgf/extend-read12-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-1.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-1.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-10.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-10.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-11.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-11.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-12.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-12.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-13.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-13.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-14.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-14.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-15.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-15.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-16.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-16.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-17.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-17.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-18.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-18.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-19.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-19.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-2.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-2.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-20.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-20.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-21.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-21.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-22.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-22.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-23.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-23.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-24.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-24.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-3.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-3.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-4.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-4.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-5.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-5.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-6.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-6.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-7.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-7.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-8.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-8.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendClassDeclarations-9.xbgf b/topics/convergence/sliced/java/xbgf/extendClassDeclarations-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendClassDeclarations-9.xbgf rename to topics/convergence/sliced/java/xbgf/extendClassDeclarations-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-1.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-1.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-10.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-10.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-11.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-11.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-12.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-12.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-13.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-13.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-14.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-14.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-15.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-15.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-2.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-2.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-3.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-3.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-4.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-4.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-5.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-5.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-6.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-6.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-7.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-7.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-8.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-8.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendDeclarations-9.xbgf b/topics/convergence/sliced/java/xbgf/extendDeclarations-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendDeclarations-9.xbgf rename to topics/convergence/sliced/java/xbgf/extendDeclarations-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-1.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-1.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-10.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-10.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-11.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-11.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-12.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-12.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-13.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-13.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-14.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-14.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-15.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-15.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-16.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-16.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-17.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-17.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-18.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-18.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-19.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-19.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-2.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-2.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-20.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-20.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-21.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-21.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-22.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-22.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-3.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-3.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-4.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-4.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-5.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-5.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-6.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-6.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-7.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-7.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-8.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-8.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendExpressions-9.xbgf b/topics/convergence/sliced/java/xbgf/extendExpressions-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendExpressions-9.xbgf rename to topics/convergence/sliced/java/xbgf/extendExpressions-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-1.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-1.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-10.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-10.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-11.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-11.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-12.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-12.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-13.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-13.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-14.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-14.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-15.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-15.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-16.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-16.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-17.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-17.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-18.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-18.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-19.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-19.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-2.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-2.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-20.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-20.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-21.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-21.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-22.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-22.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-23.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-23.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-24.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-24.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-25.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-25.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-26.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-26.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-27.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-27.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-28.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-28.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-29.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-29.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-3.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-3.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-4.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-4.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-5.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-5.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-6.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-6.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-7.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-7.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-8.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-8.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-9.xbgf b/topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendInterfaceDeclarations-9.xbgf rename to topics/convergence/sliced/java/xbgf/extendInterfaceDeclarations-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-1.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-1.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-10.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-10.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-11.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-11.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-12.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-12.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-13.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-13.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-14.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-14.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-15.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-15.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-16.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-16.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-17.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-17.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-18.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-18.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-19.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-19.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-2.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-2.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-20.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-20.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-21.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-21.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-22.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-22.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-23.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-23.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-3.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-3.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-4.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-4.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-5.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-5.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-6.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-6.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-7.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-7.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-8.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-8.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendModifiers-9.xbgf b/topics/convergence/sliced/java/xbgf/extendModifiers-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendModifiers-9.xbgf rename to topics/convergence/sliced/java/xbgf/extendModifiers-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendStatements-1.xbgf b/topics/convergence/sliced/java/xbgf/extendStatements-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendStatements-1.xbgf rename to topics/convergence/sliced/java/xbgf/extendStatements-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendStatements-2.xbgf b/topics/convergence/sliced/java/xbgf/extendStatements-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendStatements-2.xbgf rename to topics/convergence/sliced/java/xbgf/extendStatements-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendStatements-3.xbgf b/topics/convergence/sliced/java/xbgf/extendStatements-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendStatements-3.xbgf rename to topics/convergence/sliced/java/xbgf/extendStatements-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendStatements-4.xbgf b/topics/convergence/sliced/java/xbgf/extendStatements-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendStatements-4.xbgf rename to topics/convergence/sliced/java/xbgf/extendStatements-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendStatements-5.xbgf b/topics/convergence/sliced/java/xbgf/extendStatements-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendStatements-5.xbgf rename to topics/convergence/sliced/java/xbgf/extendStatements-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendStatements-6.xbgf b/topics/convergence/sliced/java/xbgf/extendStatements-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendStatements-6.xbgf rename to topics/convergence/sliced/java/xbgf/extendStatements-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendStatements-7.xbgf b/topics/convergence/sliced/java/xbgf/extendStatements-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendStatements-7.xbgf rename to topics/convergence/sliced/java/xbgf/extendStatements-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendStatements-8.xbgf b/topics/convergence/sliced/java/xbgf/extendStatements-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendStatements-8.xbgf rename to topics/convergence/sliced/java/xbgf/extendStatements-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendStatements-9.xbgf b/topics/convergence/sliced/java/xbgf/extendStatements-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendStatements-9.xbgf rename to topics/convergence/sliced/java/xbgf/extendStatements-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendWithAnnotations-1.xbgf b/topics/convergence/sliced/java/xbgf/extendWithAnnotations-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendWithAnnotations-1.xbgf rename to topics/convergence/sliced/java/xbgf/extendWithAnnotations-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendWithAnnotations-2.xbgf b/topics/convergence/sliced/java/xbgf/extendWithAnnotations-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendWithAnnotations-2.xbgf rename to topics/convergence/sliced/java/xbgf/extendWithAnnotations-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendWithAnnotations-3.xbgf b/topics/convergence/sliced/java/xbgf/extendWithAnnotations-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendWithAnnotations-3.xbgf rename to topics/convergence/sliced/java/xbgf/extendWithAnnotations-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendWithAnnotations-4.xbgf b/topics/convergence/sliced/java/xbgf/extendWithAnnotations-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendWithAnnotations-4.xbgf rename to topics/convergence/sliced/java/xbgf/extendWithAnnotations-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendWithAnnotations-5.xbgf b/topics/convergence/sliced/java/xbgf/extendWithAnnotations-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendWithAnnotations-5.xbgf rename to topics/convergence/sliced/java/xbgf/extendWithAnnotations-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendWithTypeArguments-1.xbgf b/topics/convergence/sliced/java/xbgf/extendWithTypeArguments-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendWithTypeArguments-1.xbgf rename to topics/convergence/sliced/java/xbgf/extendWithTypeArguments-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendWithTypeArguments-2.xbgf b/topics/convergence/sliced/java/xbgf/extendWithTypeArguments-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendWithTypeArguments-2.xbgf rename to topics/convergence/sliced/java/xbgf/extendWithTypeArguments-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendWithTypeArguments-3.xbgf b/topics/convergence/sliced/java/xbgf/extendWithTypeArguments-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendWithTypeArguments-3.xbgf rename to topics/convergence/sliced/java/xbgf/extendWithTypeArguments-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendWithTypeArguments-4.xbgf b/topics/convergence/sliced/java/xbgf/extendWithTypeArguments-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendWithTypeArguments-4.xbgf rename to topics/convergence/sliced/java/xbgf/extendWithTypeArguments-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/extendWithTypeArguments-5.xbgf b/topics/convergence/sliced/java/xbgf/extendWithTypeArguments-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/extendWithTypeArguments-5.xbgf rename to topics/convergence/sliced/java/xbgf/extendWithTypeArguments-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalize-impl3-1.xbgf b/topics/convergence/sliced/java/xbgf/generalize-impl3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalize-impl3-1.xbgf rename to topics/convergence/sliced/java/xbgf/generalize-impl3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalize-impl3-2.xbgf b/topics/convergence/sliced/java/xbgf/generalize-impl3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalize-impl3-2.xbgf rename to topics/convergence/sliced/java/xbgf/generalize-impl3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalize-impl3-3.xbgf b/topics/convergence/sliced/java/xbgf/generalize-impl3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalize-impl3-3.xbgf rename to topics/convergence/sliced/java/xbgf/generalize-impl3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalize-impl3-4.xbgf b/topics/convergence/sliced/java/xbgf/generalize-impl3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalize-impl3-4.xbgf rename to topics/convergence/sliced/java/xbgf/generalize-impl3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalize-impl3-5.xbgf b/topics/convergence/sliced/java/xbgf/generalize-impl3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalize-impl3-5.xbgf rename to topics/convergence/sliced/java/xbgf/generalize-impl3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalize-impl3-6.xbgf b/topics/convergence/sliced/java/xbgf/generalize-impl3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalize-impl3-6.xbgf rename to topics/convergence/sliced/java/xbgf/generalize-impl3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeBlock-1.xbgf b/topics/convergence/sliced/java/xbgf/generalizeBlock-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeBlock-1.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeBlock-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeLabels-1.xbgf b/topics/convergence/sliced/java/xbgf/generalizeLabels-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeLabels-1.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeLabels-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-1.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-1.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-10.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-10.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-11.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-11.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-12.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-12.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-2.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-2.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-3.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-3.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-4.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-4.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-5.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-5.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-6.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-6.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-7.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-7.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-8.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-8.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-9.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read1-9.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read1-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-1.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-1.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-2.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-2.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-3.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-3.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-4.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-4.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-5.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-5.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-6.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-6.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-7.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-7.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-8.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read2-8.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read2-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-1.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-1.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-10.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-10.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-11.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-11.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-12.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-12.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-13.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-13.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-14.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-14.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-15.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-15.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-16.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-16.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-17.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-17.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-18.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-18.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-19.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-19.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-2.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-2.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-20.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-20.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-21.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-21.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-22.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-22.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-3.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-3.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-4.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-4.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-5.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-5.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-6.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-6.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-7.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-7.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-8.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-8.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-9.xbgf b/topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeModifiers-read3-9.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeModifiers-read3-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-1.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-1.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-2.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-2.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-3.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-3.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-4.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-4.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-5.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-5.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-6.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-6.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-7.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-7.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-read1-1.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-read1-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-read1-1.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-read1-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-read1-2.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-read1-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-read1-2.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-read1-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-read1-3.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-read1-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-read1-3.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-read1-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-read1-4.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-read1-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-read1-4.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-read1-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeNames-read1-5.xbgf b/topics/convergence/sliced/java/xbgf/generalizeNames-read1-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeNames-read1-5.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeNames-read1-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeStatements-1.xbgf b/topics/convergence/sliced/java/xbgf/generalizeStatements-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeStatements-1.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeStatements-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/generalizeStatements-2.xbgf b/topics/convergence/sliced/java/xbgf/generalizeStatements-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/generalizeStatements-2.xbgf rename to topics/convergence/sliced/java/xbgf/generalizeStatements-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineForStatement-1.xbgf b/topics/convergence/sliced/java/xbgf/inlineForStatement-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineForStatement-1.xbgf rename to topics/convergence/sliced/java/xbgf/inlineForStatement-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-1.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-1.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-10.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-10.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-11.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-11.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-12.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-12.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-13.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-13.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-14.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-14.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-15.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-15.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-16.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-16.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-17.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-17.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-18.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-18.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-19.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-19.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-2.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-2.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-20.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-20.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-21.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-21.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-22.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-22.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-23.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-23.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-24.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-24.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-25.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-25.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-26.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-26.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-27.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-27.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-28.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-28.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-29.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-29.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-3.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-3.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-30.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-30.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-31.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-31.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-32.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-32.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-33.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-33.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-34.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-34.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-35.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-35.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-36.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-36.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-4.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-4.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-5.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-5.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-6.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-6.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-7.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-7.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-8.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-8.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/inlineStatements-9.xbgf b/topics/convergence/sliced/java/xbgf/inlineStatements-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/inlineStatements-9.xbgf rename to topics/convergence/sliced/java/xbgf/inlineStatements-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-impl1-jls1.xbgf b/topics/convergence/sliced/java/xbgf/normalize-impl1-jls1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-impl1-jls1.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-impl1-jls1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-impl2-jls2.xbgf b/topics/convergence/sliced/java/xbgf/normalize-impl2-jls2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-impl2-jls2.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-impl2-jls2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-impl3-jls3.xbgf b/topics/convergence/sliced/java/xbgf/normalize-impl3-jls3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-impl3-jls3.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-impl3-jls3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-jls1-jls12.xbgf b/topics/convergence/sliced/java/xbgf/normalize-jls1-jls12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-jls1-jls12.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-jls1-jls12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-jls12-jls123.xbgf b/topics/convergence/sliced/java/xbgf/normalize-jls12-jls123.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-jls12-jls123.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-jls12-jls123.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-read1-jls1.xbgf b/topics/convergence/sliced/java/xbgf/normalize-read1-jls1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-read1-jls1.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-read1-jls1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-read1-read12.xbgf b/topics/convergence/sliced/java/xbgf/normalize-read1-read12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-read1-read12.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-read1-read12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-read12-read123.xbgf b/topics/convergence/sliced/java/xbgf/normalize-read12-read123.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-read12-read123.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-read12-read123.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-read2-jls2.xbgf b/topics/convergence/sliced/java/xbgf/normalize-read2-jls2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-read2-jls2.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-read2-jls2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-read2-read12.xbgf b/topics/convergence/sliced/java/xbgf/normalize-read2-read12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-read2-read12.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-read2-read12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-read3-jls3.xbgf b/topics/convergence/sliced/java/xbgf/normalize-read3-jls3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-read3-jls3.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-read3-jls3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/normalize-read3-read123.xbgf b/topics/convergence/sliced/java/xbgf/normalize-read3-read123.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/normalize-read3-read123.xbgf rename to topics/convergence/sliced/java/xbgf/normalize-read3-read123.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl1-1.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl1-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl1-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl1-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl1-2.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl1-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl1-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl1-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl1-3.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl1-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl1-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl1-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl2-1.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl2-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl2-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl2-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl2-2.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl2-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl2-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl2-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl2-3.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl2-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl2-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl2-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl2-4.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl2-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl2-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl2-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl2-5.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl2-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl2-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl2-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl2-6.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl2-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl2-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl2-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl2-7.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl2-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl2-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl2-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl2-8.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl2-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl2-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl2-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-1.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-10.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-11.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-12.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-13.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-14.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-15.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-16.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-17.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-2.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-3.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-4.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-5.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-6.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-7.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-8.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-impl3-9.xbgf b/topics/convergence/sliced/java/xbgf/refactor-impl3-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-impl3-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-impl3-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-1.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-10.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-11.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-12.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-13.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-14.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-15.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-16.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-17.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-18.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-19.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-2.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-3.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-4.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-5.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-6.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-7.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-8.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactor-read1-9.xbgf b/topics/convergence/sliced/java/xbgf/refactor-read1-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactor-read1-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactor-read1-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-21.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-21.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-22.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-22.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-23.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-23.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-24.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-24.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-25.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-25.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-26.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-26.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-27.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-27.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-28.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-28.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-29.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-29.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-30.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-30.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-31.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-31.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-32.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-32.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-33.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-33.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-34.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-34.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-35.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-35.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-36.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-36.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-37.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-37.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-38.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-38.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-38.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-38.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read2-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read2-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read2-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read2-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-21.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-21.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-22.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-22.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-23.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-23.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-24.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-24.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-25.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-25.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-26.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-26.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-27.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-27.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-28.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-28.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-29.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-29.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-30.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-30.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-31.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-31.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-32.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-32.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-33.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-33.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-34.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-34.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-35.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-35.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-36.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-36.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-37.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-37.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorClasses-read3-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorClasses-read3-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorClasses-read3-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorClasses-read3-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read2-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read2-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-21.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-21.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-22.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-22.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-23.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-23.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-24.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-24.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-25.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-25.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-26.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-26.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-27.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-27.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-28.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-28.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-29.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-29.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-30.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-30.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-31.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-31.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-32.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-32.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-33.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-33.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-34.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-34.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-35.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-35.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-36.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-36.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-37.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-37.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-38.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-38.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-38.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-38.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-39.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-39.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-39.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-39.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-40.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-40.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-40.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-40.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-41.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-41.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-41.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-41.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-42.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-42.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-42.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-42.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-43.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-43.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-43.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-43.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-44.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-44.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-44.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-44.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-45.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-45.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-45.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-45.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-46.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-46.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-46.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-46.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorDeclarations-read3-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorDeclarations-read3-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorEnums-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorEnums-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorEnums-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorEnums-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorEnums-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorEnums-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorEnums-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorEnums-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorEnums-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorEnums-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorEnums-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorEnums-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-21.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-21.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-22.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-22.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-23.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-23.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-24.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-24.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-25.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-25.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-26.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-26.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-27.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-27.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-28.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-28.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-29.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-29.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-30.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-30.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-31.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-31.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-32.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-32.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-33.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-33.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-34.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-34.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-35.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-35.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorExpressions-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorExpressions-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorExpressions-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorExpressions-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-21.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-21.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read2-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read2-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-21.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-21.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-22.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-22.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-23.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-23.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-24.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-24.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-25.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-25.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-26.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-26.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-27.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-27.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-28.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-28.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-29.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-29.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-30.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-30.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-31.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-31.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-32.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-32.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-33.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-33.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-34.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-34.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-35.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-35.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-36.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-36.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-37.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-37.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-38.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-38.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-38.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-38.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-39.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-39.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-39.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-39.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-40.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-40.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-40.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-40.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-41.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-41.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-41.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-41.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-42.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-42.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-42.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-42.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-43.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-43.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-43.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-43.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-44.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-44.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-44.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-44.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-45.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-45.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-45.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-45.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-46.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-46.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-46.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-46.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-47.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-47.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-47.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-47.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-48.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-48.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-48.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-48.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-49.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-49.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-49.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-49.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-50.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-50.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-50.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-50.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-51.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-51.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-51.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-51.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-52.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-52.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-52.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-52.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-53.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-53.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-53.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-53.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-54.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-54.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-54.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-54.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorInterfaces-read3-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorInterfaces-read3-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorMinorMismatches-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorMinorMismatches-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorMinorMismatches-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorMinorMismatches-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorMinorMismatches-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorMinorMismatches-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorMinorMismatches-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorMinorMismatches-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorPackageNames-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorPackageNames-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorPackageNames-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorPackageNames-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorPackageNames-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorPackageNames-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorPackageNames-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorPackageNames-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-21.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-21.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-22.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-22.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-23.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-23.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-24.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-24.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-25.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-25.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-26.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-26.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-27.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-27.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-28.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-28.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-29.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-29.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-30.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-30.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-31.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-31.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-32.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-32.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-33.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-33.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-34.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-34.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-35.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-35.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-36.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-36.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-37.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-37.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-38.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-38.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-38.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-38.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-39.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-39.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-39.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-39.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-40.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-40.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-40.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-40.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-41.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-41.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-41.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-41.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-42.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-42.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-42.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-42.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-43.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-43.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-43.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-43.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-44.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-44.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-44.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-44.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-45.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-45.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-45.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-45.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-46.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-46.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-46.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-46.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-47.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-47.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-47.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-47.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-48.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-48.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-48.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-48.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-49.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-49.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-49.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-49.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-50.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-50.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-50.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-50.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-51.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-51.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-51.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-51.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-jls1-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-jls1-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-jls1-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-jls1-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorStatements-read3-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorStatements-read3-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorStatements-read3-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorStatements-read3-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-21.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-21.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-22.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-22.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-23.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-23.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-24.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-24.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-25.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-25.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-26.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-26.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-27.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-27.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-28.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-28.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-jls1-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-jls1-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-jls1-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-jls1-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-21.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-21.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-22.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-22.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-23.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-23.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-24.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-24.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-25.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-25.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-26.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-26.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-27.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-27.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-28.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-28.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-29.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-29.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-30.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-30.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-31.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-31.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read2-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read2-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read2-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read2-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-1.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-1.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-10.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-10.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-11.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-11.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-12.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-12.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-13.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-13.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-14.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-14.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-15.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-15.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-16.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-16.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-17.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-17.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-18.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-18.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-19.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-19.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-2.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-2.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-20.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-20.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-21.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-21.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-22.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-22.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-23.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-23.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-24.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-24.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-25.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-25.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-26.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-26.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-27.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-27.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-28.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-28.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-29.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-29.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-3.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-3.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-30.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-30.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-31.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-31.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-32.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-32.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-33.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-33.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-34.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-34.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-35.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-35.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-36.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-36.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-37.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-37.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-38.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-38.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-38.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-38.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-39.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-39.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-39.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-39.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-4.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-4.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-40.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-40.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-40.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-40.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-41.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-41.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-41.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-41.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-42.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-42.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-42.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-42.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-43.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-43.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-43.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-43.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-44.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-44.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-44.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-44.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-45.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-45.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-45.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-45.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-46.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-46.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-46.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-46.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-47.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-47.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-47.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-47.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-48.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-48.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-48.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-48.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-49.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-49.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-49.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-49.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-5.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-5.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-50.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-50.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-50.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-50.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-51.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-51.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-51.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-51.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-52.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-52.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-52.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-52.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-53.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-53.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-53.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-53.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-54.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-54.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-54.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-54.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-55.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-55.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-55.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-55.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-56.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-56.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-56.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-56.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-57.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-57.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-57.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-57.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-58.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-58.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-58.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-58.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-59.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-59.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-59.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-59.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-6.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-6.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-60.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-60.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-60.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-60.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-61.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-61.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-61.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-61.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-7.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-7.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-8.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-8.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/refactorTypes-read3-9.xbgf b/topics/convergence/sliced/java/xbgf/refactorTypes-read3-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/refactorTypes-read3-9.xbgf rename to topics/convergence/sliced/java/xbgf/refactorTypes-read3-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-1.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-1.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-10.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-10.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-11.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-11.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-12.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-12.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-13.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-13.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-14.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-14.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-15.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-15.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-16.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-16.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-17.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-17.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-18.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-18.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-19.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-19.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-2.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-2.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-20.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-20.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-21.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-21.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-22.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-22.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-23.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-23.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-24.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-24.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-25.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-25.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-26.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-26.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-27.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-27.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-28.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-28.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-29.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-29.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-3.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-3.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-30.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-30.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-31.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-31.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-32.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-32.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-4.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-4.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-5.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-5.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-6.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-6.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-7.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-7.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-8.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-8.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxClasses-read3-9.xbgf b/topics/convergence/sliced/java/xbgf/relaxClasses-read3-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxClasses-read3-9.xbgf rename to topics/convergence/sliced/java/xbgf/relaxClasses-read3-9.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-1.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-1.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-1.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-1.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-10.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-10.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-10.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-10.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-11.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-11.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-11.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-11.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-12.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-12.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-12.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-12.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-13.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-13.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-13.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-13.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-14.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-14.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-14.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-14.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-15.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-15.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-15.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-15.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-16.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-16.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-16.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-16.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-17.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-17.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-17.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-17.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-18.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-18.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-18.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-18.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-19.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-19.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-19.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-19.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-2.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-2.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-2.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-2.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-20.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-20.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-20.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-20.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-21.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-21.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-21.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-21.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-22.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-22.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-22.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-22.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-23.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-23.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-23.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-23.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-24.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-24.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-24.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-24.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-25.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-25.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-25.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-25.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-26.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-26.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-26.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-26.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-27.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-27.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-27.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-27.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-28.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-28.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-28.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-28.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-29.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-29.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-29.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-29.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-3.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-3.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-3.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-3.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-30.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-30.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-30.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-30.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-31.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-31.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-31.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-31.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-32.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-32.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-32.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-32.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-33.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-33.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-33.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-33.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-34.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-34.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-34.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-34.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-35.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-35.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-35.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-35.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-36.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-36.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-36.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-36.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-37.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-37.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-37.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-37.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-38.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-38.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-38.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-38.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-39.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-39.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-39.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-39.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-4.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-4.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-4.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-4.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-40.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-40.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-40.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-40.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-41.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-41.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-41.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-41.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-42.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-42.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-42.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-42.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-43.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-43.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-43.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-43.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-44.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-44.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-44.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-44.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-45.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-45.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-45.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-45.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-46.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-46.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-46.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-46.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-47.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-47.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-47.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-47.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-48.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-48.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-48.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-48.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-49.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-49.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-49.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-49.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-5.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-5.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-5.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-5.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-50.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-50.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-50.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-50.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-51.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-51.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-51.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-51.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-52.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-52.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-52.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-52.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-53.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-53.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-53.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-53.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-6.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-6.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-6.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-6.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-7.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-7.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-7.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-7.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-8.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-8.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-8.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-8.xbgf diff --git a/topics/convergence/java-sliced/xbgf/relaxExpressions-read3-9.xbgf b/topics/convergence/sliced/java/xbgf/relaxExpressions-read3-9.xbgf similarity index 100% rename from topics/convergence/java-sliced/xbgf/relaxExpressions-read3-9.xbgf rename to topics/convergence/sliced/java/xbgf/relaxExpressions-read3-9.xbgf diff --git a/topics/convergence/fl/.gitignore b/topics/convergence/xbgf/fl/.gitignore similarity index 100% rename from topics/convergence/fl/.gitignore rename to topics/convergence/xbgf/fl/.gitignore diff --git a/topics/convergence/fl/Makefile b/topics/convergence/xbgf/fl/Makefile similarity index 77% rename from topics/convergence/fl/Makefile rename to topics/convergence/xbgf/fl/Makefile index 1bc51972..842a69a8 100644 --- a/topics/convergence/fl/Makefile +++ b/topics/convergence/xbgf/fl/Makefile @@ -1,4 +1,4 @@ -tools = ../../../shared/tools +tools = ../../../../shared/tools validator = ${tools}/validate build: @@ -12,13 +12,8 @@ check: ls -1 bgf/*.bgf | xargs -n1 ${validator} bgf clean: - rm -f *~ - rm -f codesamples/* xmlsamples/* bgf/* + rm -f *~ *.user *.suo *.log architecture* TMP-res 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* - rm -f fl.log - diff --git a/topics/convergence/xbgf/fl/bgf/.gitignore b/topics/convergence/xbgf/fl/bgf/.gitignore new file mode 100644 index 00000000..7f8e342c --- /dev/null +++ b/topics/convergence/xbgf/fl/bgf/.gitignore @@ -0,0 +1 @@ +*.bgf diff --git a/topics/convergence/fl/fl.lcf b/topics/convergence/xbgf/fl/fl.lcf similarity index 99% rename from topics/convergence/fl/fl.lcf rename to topics/convergence/xbgf/fl/fl.lcf index a8588806..2ecea52b 100644 --- a/topics/convergence/fl/fl.lcf +++ b/topics/convergence/xbgf/fl/fl.lcf @@ -2,7 +2,7 @@ slps - ../../.. + ../../../.. fl diff --git a/topics/convergence/xbgf/fl/snapshot/.gitignore b/topics/convergence/xbgf/fl/snapshot/.gitignore new file mode 100644 index 00000000..7f8e342c --- /dev/null +++ b/topics/convergence/xbgf/fl/snapshot/.gitignore @@ -0,0 +1 @@ +*.bgf diff --git a/topics/convergence/fl/snapshot/architecture_large.pdf b/topics/convergence/xbgf/fl/snapshot/architecture_large.pdf similarity index 100% rename from topics/convergence/fl/snapshot/architecture_large.pdf rename to topics/convergence/xbgf/fl/snapshot/architecture_large.pdf diff --git a/topics/convergence/fl/snapshot/architecture_small.pdf b/topics/convergence/xbgf/fl/snapshot/architecture_small.pdf similarity index 100% rename from topics/convergence/fl/snapshot/architecture_small.pdf rename to topics/convergence/xbgf/fl/snapshot/architecture_small.pdf diff --git a/topics/convergence/fl/xbgf/.gitignore b/topics/convergence/xbgf/fl/xbgf/.gitignore similarity index 100% rename from topics/convergence/fl/xbgf/.gitignore rename to topics/convergence/xbgf/fl/xbgf/.gitignore diff --git a/topics/convergence/fl/xbgf/defineLex.xbgf b/topics/convergence/xbgf/fl/xbgf/defineLex.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/defineLex.xbgf rename to topics/convergence/xbgf/fl/xbgf/defineLex.xbgf diff --git a/topics/convergence/fl/xbgf/designate-antlr.xbgf b/topics/convergence/xbgf/fl/xbgf/designate-antlr.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/designate-antlr.xbgf rename to topics/convergence/xbgf/fl/xbgf/designate-antlr.xbgf diff --git a/topics/convergence/fl/xbgf/designate-txl.xbgf b/topics/convergence/xbgf/fl/xbgf/designate-txl.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/designate-txl.xbgf rename to topics/convergence/xbgf/fl/xbgf/designate-txl.xbgf diff --git a/topics/convergence/fl/xbgf/extractOps.xbgf b/topics/convergence/xbgf/fl/xbgf/extractOps.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/extractOps.xbgf rename to topics/convergence/xbgf/fl/xbgf/extractOps.xbgf diff --git a/topics/convergence/fl/xbgf/makeSignature.xbgf b/topics/convergence/xbgf/fl/xbgf/makeSignature.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/makeSignature.xbgf rename to topics/convergence/xbgf/fl/xbgf/makeSignature.xbgf diff --git a/topics/convergence/fl/xbgf/massage-model.xbgf b/topics/convergence/xbgf/fl/xbgf/massage-model.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/massage-model.xbgf rename to topics/convergence/xbgf/fl/xbgf/massage-model.xbgf diff --git a/topics/convergence/fl/xbgf/multipleNewlines-rascal.xbgf b/topics/convergence/xbgf/fl/xbgf/multipleNewlines-rascal.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/multipleNewlines-rascal.xbgf rename to topics/convergence/xbgf/fl/xbgf/multipleNewlines-rascal.xbgf diff --git a/topics/convergence/fl/xbgf/multipleNewlines-txl.xbgf b/topics/convergence/xbgf/fl/xbgf/multipleNewlines-txl.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/multipleNewlines-txl.xbgf rename to topics/convergence/xbgf/fl/xbgf/multipleNewlines-txl.xbgf diff --git a/topics/convergence/fl/xbgf/permuteArgs.xbgf b/topics/convergence/xbgf/fl/xbgf/permuteArgs.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/permuteArgs.xbgf rename to topics/convergence/xbgf/fl/xbgf/permuteArgs.xbgf diff --git a/topics/convergence/fl/xbgf/preferJaxb.xbgf b/topics/convergence/xbgf/fl/xbgf/preferJaxb.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/preferJaxb.xbgf rename to topics/convergence/xbgf/fl/xbgf/preferJaxb.xbgf diff --git a/topics/convergence/fl/xbgf/removeLayers.xbgf b/topics/convergence/xbgf/fl/xbgf/removeLayers.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/removeLayers.xbgf rename to topics/convergence/xbgf/fl/xbgf/removeLayers.xbgf diff --git a/topics/convergence/fl/xbgf/rename-antlr.xbgf b/topics/convergence/xbgf/fl/xbgf/rename-antlr.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/rename-antlr.xbgf rename to topics/convergence/xbgf/fl/xbgf/rename-antlr.xbgf diff --git a/topics/convergence/fl/xbgf/rename-ecore.xbgf b/topics/convergence/xbgf/fl/xbgf/rename-ecore.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/rename-ecore.xbgf rename to topics/convergence/xbgf/fl/xbgf/rename-ecore.xbgf diff --git a/topics/convergence/fl/xbgf/rename-emf.xbgf b/topics/convergence/xbgf/fl/xbgf/rename-emf.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/rename-emf.xbgf rename to topics/convergence/xbgf/fl/xbgf/rename-emf.xbgf diff --git a/topics/convergence/fl/xbgf/rename-txl.xbgf b/topics/convergence/xbgf/fl/xbgf/rename-txl.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/rename-txl.xbgf rename to topics/convergence/xbgf/fl/xbgf/rename-txl.xbgf diff --git a/topics/convergence/fl/xbgf/resolveAggregation.xbgf b/topics/convergence/xbgf/fl/xbgf/resolveAggregation.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/resolveAggregation.xbgf rename to topics/convergence/xbgf/fl/xbgf/resolveAggregation.xbgf diff --git a/topics/convergence/fl/xbgf/stripNewline.xbgf b/topics/convergence/xbgf/fl/xbgf/stripNewline.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/stripNewline.xbgf rename to topics/convergence/xbgf/fl/xbgf/stripNewline.xbgf diff --git a/topics/convergence/fl/xbgf/trim-jaxb.xbgf b/topics/convergence/xbgf/fl/xbgf/trim-jaxb.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/trim-jaxb.xbgf rename to topics/convergence/xbgf/fl/xbgf/trim-jaxb.xbgf diff --git a/topics/convergence/fl/xbgf/trim-om.xbgf b/topics/convergence/xbgf/fl/xbgf/trim-om.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/trim-om.xbgf rename to topics/convergence/xbgf/fl/xbgf/trim-om.xbgf diff --git a/topics/convergence/fl/xbgf/trim-xsd.xbgf b/topics/convergence/xbgf/fl/xbgf/trim-xsd.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/trim-xsd.xbgf rename to topics/convergence/xbgf/fl/xbgf/trim-xsd.xbgf diff --git a/topics/convergence/fl/xbgf/unchain-antlr.xbgf b/topics/convergence/xbgf/fl/xbgf/unchain-antlr.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/unchain-antlr.xbgf rename to topics/convergence/xbgf/fl/xbgf/unchain-antlr.xbgf diff --git a/topics/convergence/fl/xbgf/unerase.xbgf b/topics/convergence/xbgf/fl/xbgf/unerase.xbgf similarity index 100% rename from topics/convergence/fl/xbgf/unerase.xbgf rename to topics/convergence/xbgf/fl/xbgf/unerase.xbgf diff --git a/topics/convergence/fl/xmlsamples/.gitignore b/topics/convergence/xbgf/fl/xmlsamples/.gitignore similarity index 100% rename from topics/convergence/fl/xmlsamples/.gitignore rename to topics/convergence/xbgf/fl/xmlsamples/.gitignore