diff --git a/topics/apimigration/benchmark/.classpath b/topics/api-migration/benchmark/.classpath
similarity index 100%
rename from topics/apimigration/benchmark/.classpath
rename to topics/api-migration/benchmark/.classpath
diff --git a/topics/apimigration/benchmark/.externalToolBuilders/com.stateofflow.eclipse.metrics.MetricsBuilder.launch b/topics/api-migration/benchmark/.externalToolBuilders/com.stateofflow.eclipse.metrics.MetricsBuilder.launch
similarity index 100%
rename from topics/apimigration/benchmark/.externalToolBuilders/com.stateofflow.eclipse.metrics.MetricsBuilder.launch
rename to topics/api-migration/benchmark/.externalToolBuilders/com.stateofflow.eclipse.metrics.MetricsBuilder.launch
diff --git a/topics/apimigration/benchmark/.project b/topics/api-migration/benchmark/.project
similarity index 100%
rename from topics/apimigration/benchmark/.project
rename to topics/api-migration/benchmark/.project
diff --git a/topics/apimigration/benchmark/.settings/org.eclipse.jdt.core.prefs b/topics/api-migration/benchmark/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from topics/apimigration/benchmark/.settings/org.eclipse.jdt.core.prefs
rename to topics/api-migration/benchmark/.settings/org.eclipse.jdt.core.prefs
diff --git a/topics/apimigration/benchmark/APIStats.ql b/topics/api-migration/benchmark/APIStats.ql
similarity index 100%
rename from topics/apimigration/benchmark/APIStats.ql
rename to topics/api-migration/benchmark/APIStats.ql
diff --git a/topics/apimigration/benchmark/APIStats.qla b/topics/api-migration/benchmark/APIStats.qla
similarity index 100%
rename from topics/apimigration/benchmark/APIStats.qla
rename to topics/api-migration/benchmark/APIStats.qla
diff --git a/topics/apimigration/benchmark/Annos.ods b/topics/api-migration/benchmark/Annos.ods
similarity index 100%
rename from topics/apimigration/benchmark/Annos.ods
rename to topics/api-migration/benchmark/Annos.ods
diff --git a/topics/apimigration/benchmark/Categories.ods b/topics/api-migration/benchmark/Categories.ods
similarity index 100%
rename from topics/apimigration/benchmark/Categories.ods
rename to topics/api-migration/benchmark/Categories.ods
diff --git a/topics/apimigration/benchmark/Makefile b/topics/api-migration/benchmark/Makefile
similarity index 100%
rename from topics/apimigration/benchmark/Makefile
rename to topics/api-migration/benchmark/Makefile
diff --git a/topics/apimigration/benchmark/PackageStats on XOMandJDOM 141936.xml b/topics/api-migration/benchmark/PackageStats on XOMandJDOM 141936.xml
similarity index 100%
rename from topics/apimigration/benchmark/PackageStats on XOMandJDOM 141936.xml
rename to topics/api-migration/benchmark/PackageStats on XOMandJDOM 141936.xml
diff --git a/topics/apimigration/benchmark/PackageStats on XOMandJDOM 141936.xml.zip b/topics/api-migration/benchmark/PackageStats on XOMandJDOM 141936.xml.zip
similarity index 100%
rename from topics/apimigration/benchmark/PackageStats on XOMandJDOM 141936.xml.zip
rename to topics/api-migration/benchmark/PackageStats on XOMandJDOM 141936.xml.zip
diff --git a/topics/apimigration/benchmark/PackageStats.ql b/topics/api-migration/benchmark/PackageStats.ql
similarity index 100%
rename from topics/apimigration/benchmark/PackageStats.ql
rename to topics/api-migration/benchmark/PackageStats.ql
diff --git a/topics/apimigration/benchmark/PackageStats.qla b/topics/api-migration/benchmark/PackageStats.qla
similarity index 100%
rename from topics/apimigration/benchmark/PackageStats.qla
rename to topics/api-migration/benchmark/PackageStats.qla
diff --git a/topics/apimigration/benchmark/TODO2 b/topics/api-migration/benchmark/TODO2
similarity index 100%
rename from topics/apimigration/benchmark/TODO2
rename to topics/api-migration/benchmark/TODO2
diff --git a/topics/apimigration/benchmark/TestSuiteStats.ql b/topics/api-migration/benchmark/TestSuiteStats.ql
similarity index 100%
rename from topics/apimigration/benchmark/TestSuiteStats.ql
rename to topics/api-migration/benchmark/TestSuiteStats.ql
diff --git a/topics/apimigration/benchmark/TestSuiteStats.qla b/topics/api-migration/benchmark/TestSuiteStats.qla
similarity index 100%
rename from topics/apimigration/benchmark/TestSuiteStats.qla
rename to topics/api-migration/benchmark/TestSuiteStats.qla
diff --git a/topics/apimigration/benchmark/annos.csv b/topics/api-migration/benchmark/annos.csv
similarity index 100%
rename from topics/apimigration/benchmark/annos.csv
rename to topics/api-migration/benchmark/annos.csv
diff --git a/topics/apimigration/benchmark/apistats.xml b/topics/api-migration/benchmark/apistats.xml
similarity index 100%
rename from topics/apimigration/benchmark/apistats.xml
rename to topics/api-migration/benchmark/apistats.xml
diff --git a/topics/apimigration/benchmark/apistats.xml.zip b/topics/api-migration/benchmark/apistats.xml.zip
similarity index 100%
rename from topics/apimigration/benchmark/apistats.xml.zip
rename to topics/api-migration/benchmark/apistats.xml.zip
diff --git a/topics/apimigration/benchmark/compliance.tex b/topics/api-migration/benchmark/compliance.tex
similarity index 100%
rename from topics/apimigration/benchmark/compliance.tex
rename to topics/api-migration/benchmark/compliance.tex
diff --git a/topics/apimigration/benchmark/data/!file.xml b/topics/api-migration/benchmark/data/!file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/!file.xml
rename to topics/api-migration/benchmark/data/!file.xml
diff --git a/topics/apimigration/benchmark/data/$file.xml b/topics/api-migration/benchmark/data/$file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/$file.xml
rename to topics/api-migration/benchmark/data/$file.xml
diff --git a/topics/apimigration/benchmark/data/%file.xml b/topics/api-migration/benchmark/data/%file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/%file.xml
rename to topics/api-migration/benchmark/data/%file.xml
diff --git a/topics/apimigration/benchmark/data/&file.xml b/topics/api-migration/benchmark/data/&file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/&file.xml
rename to topics/api-migration/benchmark/data/&file.xml
diff --git a/topics/apimigration/benchmark/data/'file.xml b/topics/api-migration/benchmark/data/'file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/'file.xml
rename to topics/api-migration/benchmark/data/'file.xml
diff --git a/topics/apimigration/benchmark/data/()file.xml b/topics/api-migration/benchmark/data/()file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/()file.xml
rename to topics/api-migration/benchmark/data/()file.xml
diff --git a/topics/apimigration/benchmark/data/+file.xml b/topics/api-migration/benchmark/data/+file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/+file.xml
rename to topics/api-migration/benchmark/data/+file.xml
diff --git a/topics/apimigration/benchmark/data/097.ent b/topics/api-migration/benchmark/data/097.ent
similarity index 100%
rename from topics/apimigration/benchmark/data/097.ent
rename to topics/api-migration/benchmark/data/097.ent
diff --git a/topics/apimigration/benchmark/data/097.xml b/topics/api-migration/benchmark/data/097.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/097.xml
rename to topics/api-migration/benchmark/data/097.xml
diff --git a/topics/apimigration/benchmark/data/;file.xml b/topics/api-migration/benchmark/data/;file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/;file.xml
rename to topics/api-migration/benchmark/data/;file.xml
diff --git a/topics/apimigration/benchmark/data/=file.xml b/topics/api-migration/benchmark/data/=file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/=file.xml
rename to topics/api-migration/benchmark/data/=file.xml
diff --git a/topics/apimigration/benchmark/data/@file.xml b/topics/api-migration/benchmark/data/@file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/@file.xml
rename to topics/api-migration/benchmark/data/@file.xml
diff --git a/topics/apimigration/benchmark/data/BaseURIWithEntitiesTest.xml b/topics/api-migration/benchmark/data/BaseURIWithEntitiesTest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/BaseURIWithEntitiesTest.xml
rename to topics/api-migration/benchmark/data/BaseURIWithEntitiesTest.xml
diff --git a/topics/apimigration/benchmark/data/[file].xml b/topics/api-migration/benchmark/data/[file].xml
similarity index 100%
rename from topics/apimigration/benchmark/data/[file].xml
rename to topics/api-migration/benchmark/data/[file].xml
diff --git a/topics/apimigration/benchmark/data/^file.xml b/topics/api-migration/benchmark/data/^file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/^file.xml
rename to topics/api-migration/benchmark/data/^file.xml
diff --git a/topics/apimigration/benchmark/data/`file.xml b/topics/api-migration/benchmark/data/`file.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/`file.xml
rename to topics/api-migration/benchmark/data/`file.xml
diff --git a/topics/apimigration/benchmark/data/baserelative/dir/test.dtd b/topics/api-migration/benchmark/data/baserelative/dir/test.dtd
similarity index 100%
rename from topics/apimigration/benchmark/data/baserelative/dir/test.dtd
rename to topics/api-migration/benchmark/data/baserelative/dir/test.dtd
diff --git a/topics/apimigration/benchmark/data/baserelative/test.xml b/topics/api-migration/benchmark/data/baserelative/test.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/baserelative/test.xml
rename to topics/api-migration/benchmark/data/baserelative/test.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/commentbeforeroot.xml b/topics/api-migration/benchmark/data/canonical/input/commentbeforeroot.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/commentbeforeroot.xml
rename to topics/api-migration/benchmark/data/canonical/input/commentbeforeroot.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/doc.dtd b/topics/api-migration/benchmark/data/canonical/input/doc.dtd
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/doc.dtd
rename to topics/api-migration/benchmark/data/canonical/input/doc.dtd
diff --git a/topics/apimigration/benchmark/data/canonical/input/emptyelement.xml b/topics/api-migration/benchmark/data/canonical/input/emptyelement.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/emptyelement.xml
rename to topics/api-migration/benchmark/data/canonical/input/emptyelement.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/escapeattributevalue.xml b/topics/api-migration/benchmark/data/canonical/input/escapeattributevalue.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/escapeattributevalue.xml
rename to topics/api-migration/benchmark/data/canonical/input/escapeattributevalue.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/rootelementindefaultnamespace.xml b/topics/api-migration/benchmark/data/canonical/input/rootelementindefaultnamespace.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/rootelementindefaultnamespace.xml
rename to topics/api-migration/benchmark/data/canonical/input/rootelementindefaultnamespace.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/specialcharactersinattributevalue.xml b/topics/api-migration/benchmark/data/canonical/input/specialcharactersinattributevalue.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/specialcharactersinattributevalue.xml
rename to topics/api-migration/benchmark/data/canonical/input/specialcharactersinattributevalue.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/spectest1.xml b/topics/api-migration/benchmark/data/canonical/input/spectest1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/spectest1.xml
rename to topics/api-migration/benchmark/data/canonical/input/spectest1.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/test3.3.xml b/topics/api-migration/benchmark/data/canonical/input/test3.3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/test3.3.xml
rename to topics/api-migration/benchmark/data/canonical/input/test3.3.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/test3.4.xml b/topics/api-migration/benchmark/data/canonical/input/test3.4.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/test3.4.xml
rename to topics/api-migration/benchmark/data/canonical/input/test3.4.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/test3.5.xml b/topics/api-migration/benchmark/data/canonical/input/test3.5.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/test3.5.xml
rename to topics/api-migration/benchmark/data/canonical/input/test3.5.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/test3.6.xml b/topics/api-migration/benchmark/data/canonical/input/test3.6.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/test3.6.xml
rename to topics/api-migration/benchmark/data/canonical/input/test3.6.xml
diff --git a/topics/apimigration/benchmark/data/canonical/input/world.txt b/topics/api-migration/benchmark/data/canonical/input/world.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/input/world.txt
rename to topics/api-migration/benchmark/data/canonical/input/world.txt
diff --git a/topics/apimigration/benchmark/data/canonical/output/commentbeforeroot.xml.out b/topics/api-migration/benchmark/data/canonical/output/commentbeforeroot.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/output/commentbeforeroot.xml.out
rename to topics/api-migration/benchmark/data/canonical/output/commentbeforeroot.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/output/emptyelement.xml.out b/topics/api-migration/benchmark/data/canonical/output/emptyelement.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/output/emptyelement.xml.out
rename to topics/api-migration/benchmark/data/canonical/output/emptyelement.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/output/escapeattributevalue.xml.out b/topics/api-migration/benchmark/data/canonical/output/escapeattributevalue.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/output/escapeattributevalue.xml.out
rename to topics/api-migration/benchmark/data/canonical/output/escapeattributevalue.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/output/rootelementindefaultnamespace.xml.out b/topics/api-migration/benchmark/data/canonical/output/rootelementindefaultnamespace.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/output/rootelementindefaultnamespace.xml.out
rename to topics/api-migration/benchmark/data/canonical/output/rootelementindefaultnamespace.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/output/specialcharactersinattributevalue.xml.out b/topics/api-migration/benchmark/data/canonical/output/specialcharactersinattributevalue.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/output/specialcharactersinattributevalue.xml.out
rename to topics/api-migration/benchmark/data/canonical/output/specialcharactersinattributevalue.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/output/spectest1.xml.out b/topics/api-migration/benchmark/data/canonical/output/spectest1.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/output/spectest1.xml.out
rename to topics/api-migration/benchmark/data/canonical/output/spectest1.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/output/test3.3.xml.out b/topics/api-migration/benchmark/data/canonical/output/test3.3.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/output/test3.3.xml.out
rename to topics/api-migration/benchmark/data/canonical/output/test3.3.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/output/test3.4.xml.out b/topics/api-migration/benchmark/data/canonical/output/test3.4.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/output/test3.4.xml.out
rename to topics/api-migration/benchmark/data/canonical/output/test3.4.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/output/test3.5.xml.out b/topics/api-migration/benchmark/data/canonical/output/test3.5.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/output/test3.5.xml.out
rename to topics/api-migration/benchmark/data/canonical/output/test3.5.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/output/test3.6.xml.out b/topics/api-migration/benchmark/data/canonical/output/test3.6.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/output/test3.6.xml.out
rename to topics/api-migration/benchmark/data/canonical/output/test3.6.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/wocommentsoutput/commentbeforeroot.xml.out b/topics/api-migration/benchmark/data/canonical/wocommentsoutput/commentbeforeroot.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/wocommentsoutput/commentbeforeroot.xml.out
rename to topics/api-migration/benchmark/data/canonical/wocommentsoutput/commentbeforeroot.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/wocommentsoutput/emptyelement.xml.out b/topics/api-migration/benchmark/data/canonical/wocommentsoutput/emptyelement.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/wocommentsoutput/emptyelement.xml.out
rename to topics/api-migration/benchmark/data/canonical/wocommentsoutput/emptyelement.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/wocommentsoutput/escapeattributevalue.xml.out b/topics/api-migration/benchmark/data/canonical/wocommentsoutput/escapeattributevalue.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/wocommentsoutput/escapeattributevalue.xml.out
rename to topics/api-migration/benchmark/data/canonical/wocommentsoutput/escapeattributevalue.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/wocommentsoutput/rootelementindefaultnamespace.xml.out b/topics/api-migration/benchmark/data/canonical/wocommentsoutput/rootelementindefaultnamespace.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/wocommentsoutput/rootelementindefaultnamespace.xml.out
rename to topics/api-migration/benchmark/data/canonical/wocommentsoutput/rootelementindefaultnamespace.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/wocommentsoutput/specialcharactersinattributevalue.xml.out b/topics/api-migration/benchmark/data/canonical/wocommentsoutput/specialcharactersinattributevalue.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/wocommentsoutput/specialcharactersinattributevalue.xml.out
rename to topics/api-migration/benchmark/data/canonical/wocommentsoutput/specialcharactersinattributevalue.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/wocommentsoutput/spectest1.xml.out b/topics/api-migration/benchmark/data/canonical/wocommentsoutput/spectest1.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/wocommentsoutput/spectest1.xml.out
rename to topics/api-migration/benchmark/data/canonical/wocommentsoutput/spectest1.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/wocommentsoutput/test3.3.xml.out b/topics/api-migration/benchmark/data/canonical/wocommentsoutput/test3.3.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/wocommentsoutput/test3.3.xml.out
rename to topics/api-migration/benchmark/data/canonical/wocommentsoutput/test3.3.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/wocommentsoutput/test3.4.xml.out b/topics/api-migration/benchmark/data/canonical/wocommentsoutput/test3.4.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/wocommentsoutput/test3.4.xml.out
rename to topics/api-migration/benchmark/data/canonical/wocommentsoutput/test3.4.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/wocommentsoutput/test3.5.xml.out b/topics/api-migration/benchmark/data/canonical/wocommentsoutput/test3.5.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/wocommentsoutput/test3.5.xml.out
rename to topics/api-migration/benchmark/data/canonical/wocommentsoutput/test3.5.xml.out
diff --git a/topics/apimigration/benchmark/data/canonical/wocommentsoutput/test3.6.xml.out b/topics/api-migration/benchmark/data/canonical/wocommentsoutput/test3.6.xml.out
similarity index 100%
rename from topics/apimigration/benchmark/data/canonical/wocommentsoutput/test3.6.xml.out
rename to topics/api-migration/benchmark/data/canonical/wocommentsoutput/test3.6.xml.out
diff --git a/topics/apimigration/benchmark/data/comp.xml b/topics/api-migration/benchmark/data/comp.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/comp.xml
rename to topics/api-migration/benchmark/data/comp.xml
diff --git a/topics/apimigration/benchmark/data/content.dtd b/topics/api-migration/benchmark/data/content.dtd
similarity index 100%
rename from topics/apimigration/benchmark/data/content.dtd
rename to topics/api-migration/benchmark/data/content.dtd
diff --git a/topics/apimigration/benchmark/data/contentindtd.xml b/topics/api-migration/benchmark/data/contentindtd.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/contentindtd.xml
rename to topics/api-migration/benchmark/data/contentindtd.xml
diff --git a/topics/apimigration/benchmark/data/data_ISO-8859-2.txt b/topics/api-migration/benchmark/data/data_ISO-8859-2.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/data_ISO-8859-2.txt
rename to topics/api-migration/benchmark/data/data_ISO-8859-2.txt
diff --git a/topics/apimigration/benchmark/data/data_ISO-8859-2.xml b/topics/api-migration/benchmark/data/data_ISO-8859-2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/data_ISO-8859-2.xml
rename to topics/api-migration/benchmark/data/data_ISO-8859-2.xml
diff --git a/topics/apimigration/benchmark/data/data_ISO-8859-7.xml b/topics/api-migration/benchmark/data/data_ISO-8859-7.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/data_ISO-8859-7.xml
rename to topics/api-migration/benchmark/data/data_ISO-8859-7.xml
diff --git a/topics/apimigration/benchmark/data/data_ISO-8859-8.xml b/topics/api-migration/benchmark/data/data_ISO-8859-8.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/data_ISO-8859-8.xml
rename to topics/api-migration/benchmark/data/data_ISO-8859-8.xml
diff --git a/topics/apimigration/benchmark/data/data_UTF-8.xml b/topics/api-migration/benchmark/data/data_UTF-8.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/data_UTF-8.xml
rename to topics/api-migration/benchmark/data/data_UTF-8.xml
diff --git a/topics/apimigration/benchmark/data/dtd/xhtml-lat1.ent b/topics/api-migration/benchmark/data/dtd/xhtml-lat1.ent
similarity index 100%
rename from topics/apimigration/benchmark/data/dtd/xhtml-lat1.ent
rename to topics/api-migration/benchmark/data/dtd/xhtml-lat1.ent
diff --git a/topics/apimigration/benchmark/data/dtd/xhtml-special.ent b/topics/api-migration/benchmark/data/dtd/xhtml-special.ent
similarity index 100%
rename from topics/apimigration/benchmark/data/dtd/xhtml-special.ent
rename to topics/api-migration/benchmark/data/dtd/xhtml-special.ent
diff --git a/topics/apimigration/benchmark/data/dtd/xhtml-symbol.ent b/topics/api-migration/benchmark/data/dtd/xhtml-symbol.ent
similarity index 100%
rename from topics/apimigration/benchmark/data/dtd/xhtml-symbol.ent
rename to topics/api-migration/benchmark/data/dtd/xhtml-symbol.ent
diff --git a/topics/apimigration/benchmark/data/dtd/xhtml1-strict.dtd b/topics/api-migration/benchmark/data/dtd/xhtml1-strict.dtd
similarity index 100%
rename from topics/apimigration/benchmark/data/dtd/xhtml1-strict.dtd
rename to topics/api-migration/benchmark/data/dtd/xhtml1-strict.dtd
diff --git a/topics/apimigration/benchmark/data/dtd/xhtml1-transitional.dtd b/topics/api-migration/benchmark/data/dtd/xhtml1-transitional.dtd
similarity index 100%
rename from topics/apimigration/benchmark/data/dtd/xhtml1-transitional.dtd
rename to topics/api-migration/benchmark/data/dtd/xhtml1-transitional.dtd
diff --git a/topics/apimigration/benchmark/data/dtdtest.xhtml b/topics/api-migration/benchmark/data/dtdtest.xhtml
similarity index 100%
rename from topics/apimigration/benchmark/data/dtdtest.xhtml
rename to topics/api-migration/benchmark/data/dtdtest.xhtml
diff --git a/topics/apimigration/benchmark/data/ent21.xml b/topics/api-migration/benchmark/data/ent21.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/ent21.xml
rename to topics/api-migration/benchmark/data/ent21.xml
diff --git a/topics/apimigration/benchmark/data/entities/external.xml b/topics/api-migration/benchmark/data/entities/external.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/entities/external.xml
rename to topics/api-migration/benchmark/data/entities/external.xml
diff --git a/topics/apimigration/benchmark/data/entitytest.xml b/topics/api-migration/benchmark/data/entitytest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/entitytest.xml
rename to topics/api-migration/benchmark/data/entitytest.xml
diff --git a/topics/apimigration/benchmark/data/external.dtd b/topics/api-migration/benchmark/data/external.dtd
similarity index 100%
rename from topics/apimigration/benchmark/data/external.dtd
rename to topics/api-migration/benchmark/data/external.dtd
diff --git a/topics/apimigration/benchmark/data/external.xml b/topics/api-migration/benchmark/data/external.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/external.xml
rename to topics/api-migration/benchmark/data/external.xml
diff --git a/topics/apimigration/benchmark/data/externalDTDtest.xml b/topics/api-migration/benchmark/data/externalDTDtest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/externalDTDtest.xml
rename to topics/api-migration/benchmark/data/externalDTDtest.xml
diff --git a/topics/apimigration/benchmark/data/fibonacci_ebcdic.txt b/topics/api-migration/benchmark/data/fibonacci_ebcdic.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/fibonacci_ebcdic.txt
rename to topics/api-migration/benchmark/data/fibonacci_ebcdic.txt
diff --git a/topics/apimigration/benchmark/data/file name.xml b/topics/api-migration/benchmark/data/file name.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/file name.xml
rename to topics/api-migration/benchmark/data/file name.xml
diff --git a/topics/apimigration/benchmark/data/ge.dtd b/topics/api-migration/benchmark/data/ge.dtd
similarity index 100%
rename from topics/apimigration/benchmark/data/ge.dtd
rename to topics/api-migration/benchmark/data/ge.dtd
diff --git a/topics/apimigration/benchmark/data/ge.txt b/topics/api-migration/benchmark/data/ge.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/ge.txt
rename to topics/api-migration/benchmark/data/ge.txt
diff --git a/topics/apimigration/benchmark/data/ge.xml b/topics/api-migration/benchmark/data/ge.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/ge.xml
rename to topics/api-migration/benchmark/data/ge.xml
diff --git a/topics/apimigration/benchmark/data/hoschektest.xml b/topics/api-migration/benchmark/data/hoschektest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/hoschektest.xml
rename to topics/api-migration/benchmark/data/hoschektest.xml
diff --git a/topics/apimigration/benchmark/data/internalandexternaldtdsubsettest.xml b/topics/api-migration/benchmark/data/internalandexternaldtdsubsettest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/internalandexternaldtdsubsettest.xml
rename to topics/api-migration/benchmark/data/internalandexternaldtdsubsettest.xml
diff --git a/topics/apimigration/benchmark/data/internaldtdsubsettest.xml b/topics/api-migration/benchmark/data/internaldtdsubsettest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/internaldtdsubsettest.xml
rename to topics/api-migration/benchmark/data/internaldtdsubsettest.xml
diff --git a/topics/apimigration/benchmark/data/manynamespaces.xml b/topics/api-migration/benchmark/data/manynamespaces.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/manynamespaces.xml
rename to topics/api-migration/benchmark/data/manynamespaces.xml
diff --git a/topics/apimigration/benchmark/data/namespacetest.xsl b/topics/api-migration/benchmark/data/namespacetest.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/namespacetest.xsl
rename to topics/api-migration/benchmark/data/namespacetest.xsl
diff --git a/topics/apimigration/benchmark/data/nfctest.xml b/topics/api-migration/benchmark/data/nfctest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/nfctest.xml
rename to topics/api-migration/benchmark/data/nfctest.xml
diff --git a/topics/apimigration/benchmark/data/nfctests.xml b/topics/api-migration/benchmark/data/nfctests.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/nfctests.xml
rename to topics/api-migration/benchmark/data/nfctests.xml
diff --git a/topics/apimigration/benchmark/data/nonquirky.xhtml b/topics/api-migration/benchmark/data/nonquirky.xhtml
similarity index 100%
rename from topics/apimigration/benchmark/data/nonquirky.xhtml
rename to topics/api-migration/benchmark/data/nonquirky.xhtml
diff --git a/topics/apimigration/benchmark/data/outer21.xml b/topics/api-migration/benchmark/data/outer21.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/outer21.xml
rename to topics/api-migration/benchmark/data/outer21.xml
diff --git a/topics/apimigration/benchmark/data/pe.dtd b/topics/api-migration/benchmark/data/pe.dtd
similarity index 100%
rename from topics/apimigration/benchmark/data/pe.dtd
rename to topics/api-migration/benchmark/data/pe.dtd
diff --git a/topics/apimigration/benchmark/data/pe.txt b/topics/api-migration/benchmark/data/pe.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/pe.txt
rename to topics/api-migration/benchmark/data/pe.txt
diff --git a/topics/apimigration/benchmark/data/pe.xml b/topics/api-migration/benchmark/data/pe.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/pe.xml
rename to topics/api-migration/benchmark/data/pe.xml
diff --git a/topics/apimigration/benchmark/data/prettytest.xml b/topics/api-migration/benchmark/data/prettytest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/prettytest.xml
rename to topics/api-migration/benchmark/data/prettytest.xml
diff --git a/topics/apimigration/benchmark/data/prettyxml.xml b/topics/api-migration/benchmark/data/prettyxml.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/prettyxml.xml
rename to topics/api-migration/benchmark/data/prettyxml.xml
diff --git a/topics/apimigration/benchmark/data/quirks.xhtml b/topics/api-migration/benchmark/data/quirks.xhtml
similarity index 100%
rename from topics/apimigration/benchmark/data/quirks.xhtml
rename to topics/api-migration/benchmark/data/quirks.xhtml
diff --git a/topics/apimigration/benchmark/data/rddltest.html b/topics/api-migration/benchmark/data/rddltest.html
similarity index 100%
rename from topics/apimigration/benchmark/data/rddltest.html
rename to topics/api-migration/benchmark/data/rddltest.html
diff --git a/topics/apimigration/benchmark/data/schematest.xml b/topics/api-migration/benchmark/data/schematest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/schematest.xml
rename to topics/api-migration/benchmark/data/schematest.xml
diff --git a/topics/apimigration/benchmark/data/schematest.xsd b/topics/api-migration/benchmark/data/schematest.xsd
similarity index 100%
rename from topics/apimigration/benchmark/data/schematest.xsd
rename to topics/api-migration/benchmark/data/schematest.xsd
diff --git a/topics/apimigration/benchmark/data/sib/content/ep.xml b/topics/api-migration/benchmark/data/sib/content/ep.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/sib/content/ep.xml
rename to topics/api-migration/benchmark/data/sib/content/ep.xml
diff --git a/topics/apimigration/benchmark/data/sib/content/pe.dtd b/topics/api-migration/benchmark/data/sib/content/pe.dtd
similarity index 100%
rename from topics/apimigration/benchmark/data/sib/content/pe.dtd
rename to topics/api-migration/benchmark/data/sib/content/pe.dtd
diff --git a/topics/apimigration/benchmark/data/sib/content/pe.txt b/topics/api-migration/benchmark/data/sib/content/pe.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/sib/content/pe.txt
rename to topics/api-migration/benchmark/data/sib/content/pe.txt
diff --git a/topics/apimigration/benchmark/data/sib/content/pe.xml b/topics/api-migration/benchmark/data/sib/content/pe.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/sib/content/pe.xml
rename to topics/api-migration/benchmark/data/sib/content/pe.xml
diff --git a/topics/apimigration/benchmark/data/simplehoschektest.xml b/topics/api-migration/benchmark/data/simplehoschektest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/simplehoschektest.xml
rename to topics/api-migration/benchmark/data/simplehoschektest.xml
diff --git a/topics/apimigration/benchmark/data/soapresponse.xml b/topics/api-migration/benchmark/data/soapresponse.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/soapresponse.xml
rename to topics/api-migration/benchmark/data/soapresponse.xml
diff --git a/topics/apimigration/benchmark/data/test.xml b/topics/api-migration/benchmark/data/test.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/test.xml
rename to topics/api-migration/benchmark/data/test.xml
diff --git a/topics/apimigration/benchmark/data/test_ebcdic.xml b/topics/api-migration/benchmark/data/test_ebcdic.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/test_ebcdic.xml
rename to topics/api-migration/benchmark/data/test_ebcdic.xml
diff --git a/topics/apimigration/benchmark/data/undeclare.xml b/topics/api-migration/benchmark/data/undeclare.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/undeclare.xml
rename to topics/api-migration/benchmark/data/undeclare.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/EBCDIC.xml b/topics/api-migration/benchmark/data/xinclude/input/EBCDIC.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/EBCDIC.xml
rename to topics/api-migration/benchmark/data/xinclude/input/EBCDIC.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/UCS4BE.xml b/topics/api-migration/benchmark/data/xinclude/input/UCS4BE.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/UCS4BE.xml
rename to topics/api-migration/benchmark/data/xinclude/input/UCS4BE.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/UCS4LE.xml b/topics/api-migration/benchmark/data/xinclude/input/UCS4LE.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/UCS4LE.xml
rename to topics/api-migration/benchmark/data/xinclude/input/UCS4LE.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/UTF16BigEndianWithByteOrderMark.xml b/topics/api-migration/benchmark/data/xinclude/input/UTF16BigEndianWithByteOrderMark.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/UTF16BigEndianWithByteOrderMark.xml
rename to topics/api-migration/benchmark/data/xinclude/input/UTF16BigEndianWithByteOrderMark.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/UTF16LittleEndianWithByteOrderMark.xml b/topics/api-migration/benchmark/data/xinclude/input/UTF16LittleEndianWithByteOrderMark.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/UTF16LittleEndianWithByteOrderMark.xml
rename to topics/api-migration/benchmark/data/xinclude/input/UTF16LittleEndianWithByteOrderMark.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/UTF32BE.xml b/topics/api-migration/benchmark/data/xinclude/input/UTF32BE.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/UTF32BE.xml
rename to topics/api-migration/benchmark/data/xinclude/input/UTF32BE.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/UTF32LE.xml b/topics/api-migration/benchmark/data/xinclude/input/UTF32LE.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/UTF32LE.xml
rename to topics/api-migration/benchmark/data/xinclude/input/UTF32LE.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/UTF8WithByteOrderMark.xml b/topics/api-migration/benchmark/data/xinclude/input/UTF8WithByteOrderMark.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/UTF8WithByteOrderMark.xml
rename to topics/api-migration/benchmark/data/xinclude/input/UTF8WithByteOrderMark.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/UnicodeBigUnmarked.xml b/topics/api-migration/benchmark/data/xinclude/input/UnicodeBigUnmarked.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/UnicodeBigUnmarked.xml
rename to topics/api-migration/benchmark/data/xinclude/input/UnicodeBigUnmarked.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/UnicodeLittleUnmarked.xml b/topics/api-migration/benchmark/data/xinclude/input/UnicodeLittleUnmarked.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/UnicodeLittleUnmarked.xml
rename to topics/api-migration/benchmark/data/xinclude/input/UnicodeLittleUnmarked.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/_0123456789.txt b/topics/api-migration/benchmark/data/xinclude/input/_0123456789.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/_0123456789.txt
rename to topics/api-migration/benchmark/data/xinclude/input/_0123456789.txt
diff --git a/topics/apimigration/benchmark/data/xinclude/input/_ABCDEFGHIJKLMNOPQRSTUVWXYZ.txt b/topics/api-migration/benchmark/data/xinclude/input/_ABCDEFGHIJKLMNOPQRSTUVWXYZ.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/_ABCDEFGHIJKLMNOPQRSTUVWXYZ.txt
rename to topics/api-migration/benchmark/data/xinclude/input/_ABCDEFGHIJKLMNOPQRSTUVWXYZ.txt
diff --git a/topics/apimigration/benchmark/data/xinclude/input/a/a.xml b/topics/api-migration/benchmark/data/xinclude/input/a/a.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/a/a.xml
rename to topics/api-migration/benchmark/data/xinclude/input/a/a.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/abcdefghijklmnopqrstuvwxyz.txt b/topics/api-migration/benchmark/data/xinclude/input/abcdefghijklmnopqrstuvwxyz.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/abcdefghijklmnopqrstuvwxyz.txt
rename to topics/api-migration/benchmark/data/xinclude/input/abcdefghijklmnopqrstuvwxyz.txt
diff --git a/topics/apimigration/benchmark/data/xinclude/input/acceptenglish.xml b/topics/api-migration/benchmark/data/xinclude/input/acceptenglish.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/acceptenglish.xml
rename to topics/api-migration/benchmark/data/xinclude/input/acceptenglish.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/acceptfrench.xml b/topics/api-migration/benchmark/data/xinclude/input/acceptfrench.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/acceptfrench.xml
rename to topics/api-migration/benchmark/data/xinclude/input/acceptfrench.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/accepthtml.xml b/topics/api-migration/benchmark/data/xinclude/input/accepthtml.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/accepthtml.xml
rename to topics/api-migration/benchmark/data/xinclude/input/accepthtml.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/acceptplaintext.xml b/topics/api-migration/benchmark/data/xinclude/input/acceptplaintext.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/acceptplaintext.xml
rename to topics/api-migration/benchmark/data/xinclude/input/acceptplaintext.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/b/b.xml b/topics/api-migration/benchmark/data/xinclude/input/b/b.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/b/b.xml
rename to topics/api-migration/benchmark/data/xinclude/input/b/b.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/badelementschemedata.xml b/topics/api-migration/benchmark/data/xinclude/input/badelementschemedata.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/badelementschemedata.xml
rename to topics/api-migration/benchmark/data/xinclude/input/badelementschemedata.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/badencoding.xml b/topics/api-migration/benchmark/data/xinclude/input/badencoding.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/badencoding.xml
rename to topics/api-migration/benchmark/data/xinclude/input/badencoding.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/badparseattribute.xml b/topics/api-migration/benchmark/data/xinclude/input/badparseattribute.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/badparseattribute.xml
rename to topics/api-migration/benchmark/data/xinclude/input/badparseattribute.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/badxptr.xml b/topics/api-migration/benchmark/data/xinclude/input/badxptr.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/badxptr.xml
rename to topics/api-migration/benchmark/data/xinclude/input/badxptr.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/badxptr2.xml b/topics/api-migration/benchmark/data/xinclude/input/badxptr2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/badxptr2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/badxptr2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/badxptr3.xml b/topics/api-migration/benchmark/data/xinclude/input/badxptr3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/badxptr3.xml
rename to topics/api-migration/benchmark/data/xinclude/input/badxptr3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/badxptr4.xml b/topics/api-migration/benchmark/data/xinclude/input/badxptr4.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/badxptr4.xml
rename to topics/api-migration/benchmark/data/xinclude/input/badxptr4.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/basedata/red.xml b/topics/api-migration/benchmark/data/xinclude/input/basedata/red.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/basedata/red.xml
rename to topics/api-migration/benchmark/data/xinclude/input/basedata/red.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/baseinclude.xml b/topics/api-migration/benchmark/data/xinclude/input/baseinclude.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/baseinclude.xml
rename to topics/api-migration/benchmark/data/xinclude/input/baseinclude.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/basewithfragmentid.xml b/topics/api-migration/benchmark/data/xinclude/input/basewithfragmentid.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/basewithfragmentid.xml
rename to topics/api-migration/benchmark/data/xinclude/input/basewithfragmentid.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/basewithfragmentidchild.xml b/topics/api-migration/benchmark/data/xinclude/input/basewithfragmentidchild.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/basewithfragmentidchild.xml
rename to topics/api-migration/benchmark/data/xinclude/input/basewithfragmentidchild.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/bdisclaimer.xml b/topics/api-migration/benchmark/data/xinclude/input/bdisclaimer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/bdisclaimer.xml
rename to topics/api-migration/benchmark/data/xinclude/input/bdisclaimer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/c1.xml b/topics/api-migration/benchmark/data/xinclude/input/c1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/c1.xml
rename to topics/api-migration/benchmark/data/xinclude/input/c1.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/c2.xml b/topics/api-migration/benchmark/data/xinclude/input/c2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/c2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/c2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/c3.xml b/topics/api-migration/benchmark/data/xinclude/input/c3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/c3.xml
rename to topics/api-migration/benchmark/data/xinclude/input/c3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/c5.xml b/topics/api-migration/benchmark/data/xinclude/input/c5.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/c5.xml
rename to topics/api-migration/benchmark/data/xinclude/input/c5.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/circle1.xml b/topics/api-migration/benchmark/data/xinclude/input/circle1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/circle1.xml
rename to topics/api-migration/benchmark/data/xinclude/input/circle1.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/circle2a.xml b/topics/api-migration/benchmark/data/xinclude/input/circle2a.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/circle2a.xml
rename to topics/api-migration/benchmark/data/xinclude/input/circle2a.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/circle2b.xml b/topics/api-migration/benchmark/data/xinclude/input/circle2b.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/circle2b.xml
rename to topics/api-migration/benchmark/data/xinclude/input/circle2b.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/circleback.xml b/topics/api-migration/benchmark/data/xinclude/input/circleback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/circleback.xml
rename to topics/api-migration/benchmark/data/xinclude/input/circleback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/circlepointer1.xml b/topics/api-migration/benchmark/data/xinclude/input/circlepointer1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/circlepointer1.xml
rename to topics/api-migration/benchmark/data/xinclude/input/circlepointer1.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/circlepointer2.xml b/topics/api-migration/benchmark/data/xinclude/input/circlepointer2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/circlepointer2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/circlepointer2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/circlepointer3.xml b/topics/api-migration/benchmark/data/xinclude/input/circlepointer3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/circlepointer3.xml
rename to topics/api-migration/benchmark/data/xinclude/input/circlepointer3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/colonizedschemename.xml b/topics/api-migration/benchmark/data/xinclude/input/colonizedschemename.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/colonizedschemename.xml
rename to topics/api-migration/benchmark/data/xinclude/input/colonizedschemename.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/count.txt b/topics/api-migration/benchmark/data/xinclude/input/count.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/count.txt
rename to topics/api-migration/benchmark/data/xinclude/input/count.txt
diff --git a/topics/apimigration/benchmark/data/xinclude/input/d1.xml b/topics/api-migration/benchmark/data/xinclude/input/d1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/d1.xml
rename to topics/api-migration/benchmark/data/xinclude/input/d1.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/data.xml b/topics/api-migration/benchmark/data/xinclude/input/data.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/data.xml
rename to topics/api-migration/benchmark/data/xinclude/input/data.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/digitencoding.xml b/topics/api-migration/benchmark/data/xinclude/input/digitencoding.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/digitencoding.xml
rename to topics/api-migration/benchmark/data/xinclude/input/digitencoding.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/disclaimer.xml b/topics/api-migration/benchmark/data/xinclude/input/disclaimer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/disclaimer.xml
rename to topics/api-migration/benchmark/data/xinclude/input/disclaimer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/docwith2id.xml b/topics/api-migration/benchmark/data/xinclude/input/docwith2id.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/docwith2id.xml
rename to topics/api-migration/benchmark/data/xinclude/input/docwith2id.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/docwithid.xml b/topics/api-migration/benchmark/data/xinclude/input/docwithid.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/docwithid.xml
rename to topics/api-migration/benchmark/data/xinclude/input/docwithid.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/docwithidandtumbler.xml b/topics/api-migration/benchmark/data/xinclude/input/docwithidandtumbler.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/docwithidandtumbler.xml
rename to topics/api-migration/benchmark/data/xinclude/input/docwithidandtumbler.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/docwithxmlid.xml b/topics/api-migration/benchmark/data/xinclude/input/docwithxmlid.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/docwithxmlid.xml
rename to topics/api-migration/benchmark/data/xinclude/input/docwithxmlid.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/emptyencoding.xml b/topics/api-migration/benchmark/data/xinclude/input/emptyencoding.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/emptyencoding.xml
rename to topics/api-migration/benchmark/data/xinclude/input/emptyencoding.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/emptyfallback.xml b/topics/api-migration/benchmark/data/xinclude/input/emptyfallback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/emptyfallback.xml
rename to topics/api-migration/benchmark/data/xinclude/input/emptyfallback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/encodingheuristicstest.xml b/topics/api-migration/benchmark/data/xinclude/input/encodingheuristicstest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/encodingheuristicstest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/encodingheuristicstest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/extraattributes.xml b/topics/api-migration/benchmark/data/xinclude/input/extraattributes.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/extraattributes.xml
rename to topics/api-migration/benchmark/data/xinclude/input/extraattributes.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/fallbackbadparseattribute.xml b/topics/api-migration/benchmark/data/xinclude/input/fallbackbadparseattribute.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/fallbackbadparseattribute.xml
rename to topics/api-migration/benchmark/data/xinclude/input/fallbackbadparseattribute.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/fallbackbadxpointer.xml b/topics/api-migration/benchmark/data/xinclude/input/fallbackbadxpointer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/fallbackbadxpointer.xml
rename to topics/api-migration/benchmark/data/xinclude/input/fallbackbadxpointer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/fallbackcontainsfallback.xml b/topics/api-migration/benchmark/data/xinclude/input/fallbackcontainsfallback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/fallbackcontainsfallback.xml
rename to topics/api-migration/benchmark/data/xinclude/input/fallbackcontainsfallback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/fallbackinternalxpointer.xml b/topics/api-migration/benchmark/data/xinclude/input/fallbackinternalxpointer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/fallbackinternalxpointer.xml
rename to topics/api-migration/benchmark/data/xinclude/input/fallbackinternalxpointer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/fallbacknohreforparse.xml b/topics/api-migration/benchmark/data/xinclude/input/fallbacknohreforparse.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/fallbacknohreforparse.xml
rename to topics/api-migration/benchmark/data/xinclude/input/fallbacknohreforparse.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/fallbacktest.xml b/topics/api-migration/benchmark/data/xinclude/input/fallbacktest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/fallbacktest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/fallbacktest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/fallbacktest2.xml b/topics/api-migration/benchmark/data/xinclude/input/fallbacktest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/fallbacktest2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/fallbacktest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/fallbacktest3.xml b/topics/api-migration/benchmark/data/xinclude/input/fallbacktest3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/fallbacktest3.xml
rename to topics/api-migration/benchmark/data/xinclude/input/fallbacktest3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/fallbacktotext.xml b/topics/api-migration/benchmark/data/xinclude/input/fallbacktotext.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/fallbacktotext.xml
rename to topics/api-migration/benchmark/data/xinclude/input/fallbacktotext.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/fallbackxpointerpointsnowhere.xml b/topics/api-migration/benchmark/data/xinclude/input/fallbackxpointerpointsnowhere.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/fallbackxpointerpointsnowhere.xml
rename to topics/api-migration/benchmark/data/xinclude/input/fallbackxpointerpointsnowhere.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/french.xml b/topics/api-migration/benchmark/data/xinclude/input/french.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/french.xml
rename to topics/api-migration/benchmark/data/xinclude/input/french.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/french2.xml b/topics/api-migration/benchmark/data/xinclude/input/french2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/french2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/french2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/hiddenerror.xml b/topics/api-migration/benchmark/data/xinclude/input/hiddenerror.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/hiddenerror.xml
rename to topics/api-migration/benchmark/data/xinclude/input/hiddenerror.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/hiddenerror2.xml b/topics/api-migration/benchmark/data/xinclude/input/hiddenerror2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/hiddenerror2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/hiddenerror2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/hiddenerror3.xml b/topics/api-migration/benchmark/data/xinclude/input/hiddenerror3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/hiddenerror3.xml
rename to topics/api-migration/benchmark/data/xinclude/input/hiddenerror3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/ignoresfragmentid.xml b/topics/api-migration/benchmark/data/xinclude/input/ignoresfragmentid.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/ignoresfragmentid.xml
rename to topics/api-migration/benchmark/data/xinclude/input/ignoresfragmentid.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/includedocumentwithintradocumentreferences.xml b/topics/api-migration/benchmark/data/xinclude/input/includedocumentwithintradocumentreferences.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/includedocumentwithintradocumentreferences.xml
rename to topics/api-migration/benchmark/data/xinclude/input/includedocumentwithintradocumentreferences.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/includefromsamedocumentwithbase.xml b/topics/api-migration/benchmark/data/xinclude/input/includefromsamedocumentwithbase.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/includefromsamedocumentwithbase.xml
rename to topics/api-migration/benchmark/data/xinclude/input/includefromsamedocumentwithbase.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/internalcircular.xml b/topics/api-migration/benchmark/data/xinclude/input/internalcircular.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/internalcircular.xml
rename to topics/api-migration/benchmark/data/xinclude/input/internalcircular.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/internalcircularviaancestor.xml b/topics/api-migration/benchmark/data/xinclude/input/internalcircularviaancestor.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/internalcircularviaancestor.xml
rename to topics/api-migration/benchmark/data/xinclude/input/internalcircularviaancestor.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/langtest1.xml b/topics/api-migration/benchmark/data/xinclude/input/langtest1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/langtest1.xml
rename to topics/api-migration/benchmark/data/xinclude/input/langtest1.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/langtest2.xml b/topics/api-migration/benchmark/data/xinclude/input/langtest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/langtest2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/langtest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/langtest3.xml b/topics/api-migration/benchmark/data/xinclude/input/langtest3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/langtest3.xml
rename to topics/api-migration/benchmark/data/xinclude/input/langtest3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/laterfailure.xml b/topics/api-migration/benchmark/data/xinclude/input/laterfailure.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/laterfailure.xml
rename to topics/api-migration/benchmark/data/xinclude/input/laterfailure.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/laterfailure2.xml b/topics/api-migration/benchmark/data/xinclude/input/laterfailure2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/laterfailure2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/laterfailure2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/latin1.xml b/topics/api-migration/benchmark/data/xinclude/input/latin1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/latin1.xml
rename to topics/api-migration/benchmark/data/xinclude/input/latin1.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/legalcircle.xml b/topics/api-migration/benchmark/data/xinclude/input/legalcircle.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/legalcircle.xml
rename to topics/api-migration/benchmark/data/xinclude/input/legalcircle.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/lineends.txt b/topics/api-migration/benchmark/data/xinclude/input/lineends.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/lineends.txt
rename to topics/api-migration/benchmark/data/xinclude/input/lineends.txt
diff --git a/topics/apimigration/benchmark/data/xinclude/input/lineends.xml b/topics/api-migration/benchmark/data/xinclude/input/lineends.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/lineends.xml
rename to topics/api-migration/benchmark/data/xinclude/input/lineends.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/lowercasealphabet.xml b/topics/api-migration/benchmark/data/xinclude/input/lowercasealphabet.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/lowercasealphabet.xml
rename to topics/api-migration/benchmark/data/xinclude/input/lowercasealphabet.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/lowerpunctuation.xml b/topics/api-migration/benchmark/data/xinclude/input/lowerpunctuation.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/lowerpunctuation.xml
rename to topics/api-migration/benchmark/data/xinclude/input/lowerpunctuation.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/marshtest.xml b/topics/api-migration/benchmark/data/xinclude/input/marshtest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/marshtest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/marshtest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/marshtestwithxmlbase.xml b/topics/api-migration/benchmark/data/xinclude/input/marshtestwithxmlbase.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/marshtestwithxmlbase.xml
rename to topics/api-migration/benchmark/data/xinclude/input/marshtestwithxmlbase.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/marshtestwithxmlbaseandemptyhref.xml b/topics/api-migration/benchmark/data/xinclude/input/marshtestwithxmlbaseandemptyhref.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/marshtestwithxmlbaseandemptyhref.xml
rename to topics/api-migration/benchmark/data/xinclude/input/marshtestwithxmlbaseandemptyhref.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/meaninglessfragmentid.xml b/topics/api-migration/benchmark/data/xinclude/input/meaninglessfragmentid.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/meaninglessfragmentid.xml
rename to topics/api-migration/benchmark/data/xinclude/input/meaninglessfragmentid.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbacktest.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbacktest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbacktest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbacktest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbacktest2.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbacktest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbacktest2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbacktest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbacktest3.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbacktest3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbacktest3.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbacktest3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbacktest4.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbacktest4.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbacktest4.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbacktest4.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbacktest5.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbacktest5.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbacktest5.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbacktest5.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbacktest6.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbacktest6.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbacktest6.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbacktest6.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbacktestwithfragmentid.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbacktestwithfragmentid.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbacktestwithfragmentid.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbacktestwithfragmentid.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbacktestwithxpointer.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbacktestwithxpointer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbacktestwithxpointer.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbacktestwithxpointer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbacktestwithxpointer2.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbacktestwithxpointer2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbacktestwithxpointer2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbacktestwithxpointer2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbacktotexttest.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbacktotexttest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbacktotexttest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbacktotexttest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metafallbackwithbadxpointertest.xml b/topics/api-migration/benchmark/data/xinclude/input/metafallbackwithbadxpointertest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metafallbackwithbadxpointertest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metafallbackwithbadxpointertest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/metamissingfallbacktestwithxpointer.xml b/topics/api-migration/benchmark/data/xinclude/input/metamissingfallbacktestwithxpointer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/metamissingfallbacktestwithxpointer.xml
rename to topics/api-migration/benchmark/data/xinclude/input/metamissingfallbacktestwithxpointer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/middlepunctuationerror.xml b/topics/api-migration/benchmark/data/xinclude/input/middlepunctuationerror.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/middlepunctuationerror.xml
rename to topics/api-migration/benchmark/data/xinclude/input/middlepunctuationerror.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/missingfile.xml b/topics/api-migration/benchmark/data/xinclude/input/missingfile.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/missingfile.xml
rename to topics/api-migration/benchmark/data/xinclude/input/missingfile.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/missinghref.xml b/topics/api-migration/benchmark/data/xinclude/input/missinghref.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/missinghref.xml
rename to topics/api-migration/benchmark/data/xinclude/input/missinghref.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/multiplefallbacks.xml b/topics/api-migration/benchmark/data/xinclude/input/multiplefallbacks.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/multiplefallbacks.xml
rename to topics/api-migration/benchmark/data/xinclude/input/multiplefallbacks.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/multiplefallbacks2.xml b/topics/api-migration/benchmark/data/xinclude/input/multiplefallbacks2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/multiplefallbacks2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/multiplefallbacks2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/nakedfallback.xml b/topics/api-migration/benchmark/data/xinclude/input/nakedfallback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/nakedfallback.xml
rename to topics/api-migration/benchmark/data/xinclude/input/nakedfallback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/namespaceinner.xml b/topics/api-migration/benchmark/data/xinclude/input/namespaceinner.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/namespaceinner.xml
rename to topics/api-migration/benchmark/data/xinclude/input/namespaceinner.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/namespacetest.xml b/topics/api-migration/benchmark/data/xinclude/input/namespacetest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/namespacetest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/namespacetest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/nestedxinclude.xml b/topics/api-migration/benchmark/data/xinclude/input/nestedxinclude.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/nestedxinclude.xml
rename to topics/api-migration/benchmark/data/xinclude/input/nestedxinclude.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/nestedxincludenamespace.xml b/topics/api-migration/benchmark/data/xinclude/input/nestedxincludenamespace.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/nestedxincludenamespace.xml
rename to topics/api-migration/benchmark/data/xinclude/input/nestedxincludenamespace.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/nofallbacktest.xml b/topics/api-migration/benchmark/data/xinclude/input/nofallbacktest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/nofallbacktest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/nofallbacktest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/nolang.xml b/topics/api-migration/benchmark/data/xinclude/input/nolang.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/nolang.xml
rename to topics/api-migration/benchmark/data/xinclude/input/nolang.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/numeric.xml b/topics/api-migration/benchmark/data/xinclude/input/numeric.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/numeric.xml
rename to topics/api-migration/benchmark/data/xinclude/input/numeric.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/onedown.xml b/topics/api-migration/benchmark/data/xinclude/input/onedown.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/onedown.xml
rename to topics/api-migration/benchmark/data/xinclude/input/onedown.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/onlyxpointer.xml b/topics/api-migration/benchmark/data/xinclude/input/onlyxpointer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/onlyxpointer.xml
rename to topics/api-migration/benchmark/data/xinclude/input/onlyxpointer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/paralleltest.xml b/topics/api-migration/benchmark/data/xinclude/input/paralleltest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/paralleltest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/paralleltest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/parseequalxml.xml b/topics/api-migration/benchmark/data/xinclude/input/parseequalxml.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/parseequalxml.xml
rename to topics/api-migration/benchmark/data/xinclude/input/parseequalxml.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/punctuation.xml b/topics/api-migration/benchmark/data/xinclude/input/punctuation.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/punctuation.xml
rename to topics/api-migration/benchmark/data/xinclude/input/punctuation.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/recursewithinsamedocument.xml b/topics/api-migration/benchmark/data/xinclude/input/recursewithinsamedocument.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/recursewithinsamedocument.xml
rename to topics/api-migration/benchmark/data/xinclude/input/recursewithinsamedocument.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/red.dtd b/topics/api-migration/benchmark/data/xinclude/input/red.dtd
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/red.dtd
rename to topics/api-migration/benchmark/data/xinclude/input/red.dtd
diff --git a/topics/apimigration/benchmark/data/xinclude/input/relative.xml b/topics/api-migration/benchmark/data/xinclude/input/relative.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/relative.xml
rename to topics/api-migration/benchmark/data/xinclude/input/relative.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/resolvethruxpointer.xml b/topics/api-migration/benchmark/data/xinclude/input/resolvethruxpointer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/resolvethruxpointer.xml
rename to topics/api-migration/benchmark/data/xinclude/input/resolvethruxpointer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/rootfailuretest.xml b/topics/api-migration/benchmark/data/xinclude/input/rootfailuretest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/rootfailuretest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/rootfailuretest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/roottest.xml b/topics/api-migration/benchmark/data/xinclude/input/roottest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/roottest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/roottest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/roottest2.xml b/topics/api-migration/benchmark/data/xinclude/input/roottest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/roottest2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/roottest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/simple.xml b/topics/api-migration/benchmark/data/xinclude/input/simple.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/simple.xml
rename to topics/api-migration/benchmark/data/xinclude/input/simple.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/simple2.xml b/topics/api-migration/benchmark/data/xinclude/input/simple2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/simple2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/simple2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/test.xml b/topics/api-migration/benchmark/data/xinclude/input/test.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/test.xml
rename to topics/api-migration/benchmark/data/xinclude/input/test.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/test0.xml b/topics/api-migration/benchmark/data/xinclude/input/test0.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/test0.xml
rename to topics/api-migration/benchmark/data/xinclude/input/test0.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/test2.xml b/topics/api-migration/benchmark/data/xinclude/input/test2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/test2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/test2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/test3.xml b/topics/api-migration/benchmark/data/xinclude/input/test3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/test3.xml
rename to topics/api-migration/benchmark/data/xinclude/input/test3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/text/.AppleFileInfo/UnicodeBigUnmarked.xml..RF b/topics/api-migration/benchmark/data/xinclude/input/text/.AppleFileInfo/UnicodeBigUnmarked.xml..RF
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/text/.AppleFileInfo/UnicodeBigUnmarked.xml..RF
rename to topics/api-migration/benchmark/data/xinclude/input/text/.AppleFileInfo/UnicodeBigUnmarked.xml..RF
diff --git a/topics/apimigration/benchmark/data/xinclude/input/text/.AppleFileInfo/UnicodeLittleUnmarked.xml..RF b/topics/api-migration/benchmark/data/xinclude/input/text/.AppleFileInfo/UnicodeLittleUnmarked.xml..RF
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/text/.AppleFileInfo/UnicodeLittleUnmarked.xml..RF
rename to topics/api-migration/benchmark/data/xinclude/input/text/.AppleFileInfo/UnicodeLittleUnmarked.xml..RF
diff --git a/topics/apimigration/benchmark/data/xinclude/input/text/EBCDIC.xml b/topics/api-migration/benchmark/data/xinclude/input/text/EBCDIC.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/text/EBCDIC.xml
rename to topics/api-migration/benchmark/data/xinclude/input/text/EBCDIC.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/text/UTF32BE.xml b/topics/api-migration/benchmark/data/xinclude/input/text/UTF32BE.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/text/UTF32BE.xml
rename to topics/api-migration/benchmark/data/xinclude/input/text/UTF32BE.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/text/UTF32LE.xml b/topics/api-migration/benchmark/data/xinclude/input/text/UTF32LE.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/text/UTF32LE.xml
rename to topics/api-migration/benchmark/data/xinclude/input/text/UTF32LE.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/text/UTF8.xml b/topics/api-migration/benchmark/data/xinclude/input/text/UTF8.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/text/UTF8.xml
rename to topics/api-migration/benchmark/data/xinclude/input/text/UTF8.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/text/UnicodeBigUnmarked.xml b/topics/api-migration/benchmark/data/xinclude/input/text/UnicodeBigUnmarked.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/text/UnicodeBigUnmarked.xml
rename to topics/api-migration/benchmark/data/xinclude/input/text/UnicodeBigUnmarked.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/text/UnicodeLittleUnmarked.xml b/topics/api-migration/benchmark/data/xinclude/input/text/UnicodeLittleUnmarked.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/text/UnicodeLittleUnmarked.xml
rename to topics/api-migration/benchmark/data/xinclude/input/text/UnicodeLittleUnmarked.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/tobinbottom.xml b/topics/api-migration/benchmark/data/xinclude/input/tobinbottom.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/tobinbottom.xml
rename to topics/api-migration/benchmark/data/xinclude/input/tobinbottom.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/tobinmiddle.xml b/topics/api-migration/benchmark/data/xinclude/input/tobinmiddle.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/tobinmiddle.xml
rename to topics/api-migration/benchmark/data/xinclude/input/tobinmiddle.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/tobintop.xml b/topics/api-migration/benchmark/data/xinclude/input/tobintop.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/tobintop.xml
rename to topics/api-migration/benchmark/data/xinclude/input/tobintop.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/toplevel.xml b/topics/api-migration/benchmark/data/xinclude/input/toplevel.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/toplevel.xml
rename to topics/api-migration/benchmark/data/xinclude/input/toplevel.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/ucs4bigendian.xml b/topics/api-migration/benchmark/data/xinclude/input/ucs4bigendian.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/ucs4bigendian.xml
rename to topics/api-migration/benchmark/data/xinclude/input/ucs4bigendian.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/ucs4littleendian.xml b/topics/api-migration/benchmark/data/xinclude/input/ucs4littleendian.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/ucs4littleendian.xml
rename to topics/api-migration/benchmark/data/xinclude/input/ucs4littleendian.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/unrecognizedscheme.xml b/topics/api-migration/benchmark/data/xinclude/input/unrecognizedscheme.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/unrecognizedscheme.xml
rename to topics/api-migration/benchmark/data/xinclude/input/unrecognizedscheme.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/unrecognizedschemewithfallback.xml b/topics/api-migration/benchmark/data/xinclude/input/unrecognizedschemewithfallback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/unrecognizedschemewithfallback.xml
rename to topics/api-migration/benchmark/data/xinclude/input/unrecognizedschemewithfallback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/uppercase.txt b/topics/api-migration/benchmark/data/xinclude/input/uppercase.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/uppercase.txt
rename to topics/api-migration/benchmark/data/xinclude/input/uppercase.txt
diff --git a/topics/apimigration/benchmark/data/xinclude/input/uppercasealphabet.xml b/topics/api-migration/benchmark/data/xinclude/input/uppercasealphabet.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/uppercasealphabet.xml
rename to topics/api-migration/benchmark/data/xinclude/input/uppercasealphabet.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/utf16.txt b/topics/api-migration/benchmark/data/xinclude/input/utf16.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/utf16.txt
rename to topics/api-migration/benchmark/data/xinclude/input/utf16.txt
diff --git a/topics/apimigration/benchmark/data/xinclude/input/utf16.xml b/topics/api-migration/benchmark/data/xinclude/input/utf16.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/utf16.xml
rename to topics/api-migration/benchmark/data/xinclude/input/utf16.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/utf16be.txt b/topics/api-migration/benchmark/data/xinclude/input/utf16be.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/utf16be.txt
rename to topics/api-migration/benchmark/data/xinclude/input/utf16be.txt
diff --git a/topics/apimigration/benchmark/data/xinclude/input/utf16be.xml b/topics/api-migration/benchmark/data/xinclude/input/utf16be.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/utf16be.xml
rename to topics/api-migration/benchmark/data/xinclude/input/utf16be.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/utf16le.xml b/topics/api-migration/benchmark/data/xinclude/input/utf16le.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/utf16le.xml
rename to topics/api-migration/benchmark/data/xinclude/input/utf16le.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/utf8.xml b/topics/api-migration/benchmark/data/xinclude/input/utf8.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/utf8.xml
rename to topics/api-migration/benchmark/data/xinclude/input/utf8.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/utf8bom.xml b/topics/api-migration/benchmark/data/xinclude/input/utf8bom.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/utf8bom.xml
rename to topics/api-migration/benchmark/data/xinclude/input/utf8bom.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xmlbasetest.xml b/topics/api-migration/benchmark/data/xinclude/input/xmlbasetest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xmlbasetest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xmlbasetest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xmlbasetest2.xml b/topics/api-migration/benchmark/data/xinclude/input/xmlbasetest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xmlbasetest2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xmlbasetest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xmlbasetest3.xml b/topics/api-migration/benchmark/data/xinclude/input/xmlbasetest3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xmlbasetest3.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xmlbasetest3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xmlidtest.xml b/topics/api-migration/benchmark/data/xinclude/input/xmlidtest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xmlidtest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xmlidtest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xpointeroverridesfragmentid.xml b/topics/api-migration/benchmark/data/xinclude/input/xpointeroverridesfragmentid.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xpointeroverridesfragmentid.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xpointeroverridesfragmentid.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xpointerselectsnonelements.xml b/topics/api-migration/benchmark/data/xinclude/input/xpointerselectsnonelements.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xpointerselectsnonelements.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xpointerselectsnonelements.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xpointerwithpercentescape.xml b/topics/api-migration/benchmark/data/xinclude/input/xpointerwithpercentescape.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xpointerwithpercentescape.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xpointerwithpercentescape.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptr2tumblertest.xml b/topics/api-migration/benchmark/data/xinclude/input/xptr2tumblertest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptr2tumblertest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptr2tumblertest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptrdoublechildsequence.xml b/topics/api-migration/benchmark/data/xinclude/input/xptrdoublechildsequence.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptrdoublechildsequence.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptrdoublechildsequence.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptrdoubleelementtest.xml b/topics/api-migration/benchmark/data/xinclude/input/xptrdoubleelementtest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptrdoubleelementtest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptrdoubleelementtest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptrdoubletumblertest.xml b/topics/api-migration/benchmark/data/xinclude/input/xptrdoubletumblertest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptrdoubletumblertest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptrdoubletumblertest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptrfallback.xml b/topics/api-migration/benchmark/data/xinclude/input/xptrfallback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptrfallback.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptrfallback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptridandtumblertest.xml b/topics/api-migration/benchmark/data/xinclude/input/xptridandtumblertest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptridandtumblertest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptridandtumblertest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptridtest.xml b/topics/api-migration/benchmark/data/xinclude/input/xptridtest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptridtest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptridtest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptridtest2.xml b/topics/api-migration/benchmark/data/xinclude/input/xptridtest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptridtest2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptridtest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptrsyntaxerrorbutfallback.xml b/topics/api-migration/benchmark/data/xinclude/input/xptrsyntaxerrorbutfallback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptrsyntaxerrorbutfallback.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptrsyntaxerrorbutfallback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptrtumblerfailsbutfallback.xml b/topics/api-migration/benchmark/data/xinclude/input/xptrtumblerfailsbutfallback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptrtumblerfailsbutfallback.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptrtumblerfailsbutfallback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptrtumblertest.xml b/topics/api-migration/benchmark/data/xinclude/input/xptrtumblertest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptrtumblertest.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptrtumblertest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptrtumblertest2.xml b/topics/api-migration/benchmark/data/xinclude/input/xptrtumblertest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptrtumblertest2.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptrtumblertest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/input/xptrtumblertest3.xml b/topics/api-migration/benchmark/data/xinclude/input/xptrtumblertest3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/input/xptrtumblertest3.xml
rename to topics/api-migration/benchmark/data/xinclude/input/xptrtumblertest3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/EBCDIC.xml b/topics/api-migration/benchmark/data/xinclude/output/EBCDIC.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/EBCDIC.xml
rename to topics/api-migration/benchmark/data/xinclude/output/EBCDIC.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/UTF16BigEndianWithByteOrderMark.xml b/topics/api-migration/benchmark/data/xinclude/output/UTF16BigEndianWithByteOrderMark.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/UTF16BigEndianWithByteOrderMark.xml
rename to topics/api-migration/benchmark/data/xinclude/output/UTF16BigEndianWithByteOrderMark.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/UTF16LittleEndianWithByteOrderMark.xml b/topics/api-migration/benchmark/data/xinclude/output/UTF16LittleEndianWithByteOrderMark.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/UTF16LittleEndianWithByteOrderMark.xml
rename to topics/api-migration/benchmark/data/xinclude/output/UTF16LittleEndianWithByteOrderMark.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/UTF32BE.xml b/topics/api-migration/benchmark/data/xinclude/output/UTF32BE.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/UTF32BE.xml
rename to topics/api-migration/benchmark/data/xinclude/output/UTF32BE.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/UTF32LE.xml b/topics/api-migration/benchmark/data/xinclude/output/UTF32LE.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/UTF32LE.xml
rename to topics/api-migration/benchmark/data/xinclude/output/UTF32LE.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/UTF8WithByteOrderMark.xml b/topics/api-migration/benchmark/data/xinclude/output/UTF8WithByteOrderMark.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/UTF8WithByteOrderMark.xml
rename to topics/api-migration/benchmark/data/xinclude/output/UTF8WithByteOrderMark.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/UnicodeBigUnmarked.xml b/topics/api-migration/benchmark/data/xinclude/output/UnicodeBigUnmarked.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/UnicodeBigUnmarked.xml
rename to topics/api-migration/benchmark/data/xinclude/output/UnicodeBigUnmarked.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/UnicodeLittleUnmarked.xml b/topics/api-migration/benchmark/data/xinclude/output/UnicodeLittleUnmarked.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/UnicodeLittleUnmarked.xml
rename to topics/api-migration/benchmark/data/xinclude/output/UnicodeLittleUnmarked.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/acceptascii.xml b/topics/api-migration/benchmark/data/xinclude/output/acceptascii.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/acceptascii.xml
rename to topics/api-migration/benchmark/data/xinclude/output/acceptascii.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/acceptenglish.xml b/topics/api-migration/benchmark/data/xinclude/output/acceptenglish.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/acceptenglish.xml
rename to topics/api-migration/benchmark/data/xinclude/output/acceptenglish.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/acceptfrench.xml b/topics/api-migration/benchmark/data/xinclude/output/acceptfrench.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/acceptfrench.xml
rename to topics/api-migration/benchmark/data/xinclude/output/acceptfrench.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/accepthtml.xml b/topics/api-migration/benchmark/data/xinclude/output/accepthtml.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/accepthtml.xml
rename to topics/api-migration/benchmark/data/xinclude/output/accepthtml.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/acceptjis.xml b/topics/api-migration/benchmark/data/xinclude/output/acceptjis.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/acceptjis.xml
rename to topics/api-migration/benchmark/data/xinclude/output/acceptjis.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/acceptplaintext.xml b/topics/api-migration/benchmark/data/xinclude/output/acceptplaintext.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/acceptplaintext.xml
rename to topics/api-migration/benchmark/data/xinclude/output/acceptplaintext.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/badelementschemedata.xml b/topics/api-migration/benchmark/data/xinclude/output/badelementschemedata.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/badelementschemedata.xml
rename to topics/api-migration/benchmark/data/xinclude/output/badelementschemedata.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/basewithfragmentid.xml b/topics/api-migration/benchmark/data/xinclude/output/basewithfragmentid.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/basewithfragmentid.xml
rename to topics/api-migration/benchmark/data/xinclude/output/basewithfragmentid.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/c1.xml b/topics/api-migration/benchmark/data/xinclude/output/c1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/c1.xml
rename to topics/api-migration/benchmark/data/xinclude/output/c1.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/c1a.xml b/topics/api-migration/benchmark/data/xinclude/output/c1a.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/c1a.xml
rename to topics/api-migration/benchmark/data/xinclude/output/c1a.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/c1b.xml b/topics/api-migration/benchmark/data/xinclude/output/c1b.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/c1b.xml
rename to topics/api-migration/benchmark/data/xinclude/output/c1b.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/c2.xml b/topics/api-migration/benchmark/data/xinclude/output/c2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/c2.xml
rename to topics/api-migration/benchmark/data/xinclude/output/c2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/c2a.xml b/topics/api-migration/benchmark/data/xinclude/output/c2a.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/c2a.xml
rename to topics/api-migration/benchmark/data/xinclude/output/c2a.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/c2b.xml b/topics/api-migration/benchmark/data/xinclude/output/c2b.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/c2b.xml
rename to topics/api-migration/benchmark/data/xinclude/output/c2b.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/c2c.xml b/topics/api-migration/benchmark/data/xinclude/output/c2c.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/c2c.xml
rename to topics/api-migration/benchmark/data/xinclude/output/c2c.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/c2d.xml b/topics/api-migration/benchmark/data/xinclude/output/c2d.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/c2d.xml
rename to topics/api-migration/benchmark/data/xinclude/output/c2d.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/c3.xml b/topics/api-migration/benchmark/data/xinclude/output/c3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/c3.xml
rename to topics/api-migration/benchmark/data/xinclude/output/c3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/c5.xml b/topics/api-migration/benchmark/data/xinclude/output/c5.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/c5.xml
rename to topics/api-migration/benchmark/data/xinclude/output/c5.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/d1.xml b/topics/api-migration/benchmark/data/xinclude/output/d1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/d1.xml
rename to topics/api-migration/benchmark/data/xinclude/output/d1.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/disclaimer.xml b/topics/api-migration/benchmark/data/xinclude/output/disclaimer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/disclaimer.xml
rename to topics/api-migration/benchmark/data/xinclude/output/disclaimer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/emptyfallback.xml b/topics/api-migration/benchmark/data/xinclude/output/emptyfallback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/emptyfallback.xml
rename to topics/api-migration/benchmark/data/xinclude/output/emptyfallback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/encodingheuristicstest.xml b/topics/api-migration/benchmark/data/xinclude/output/encodingheuristicstest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/encodingheuristicstest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/encodingheuristicstest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/fallbacktest.xml b/topics/api-migration/benchmark/data/xinclude/output/fallbacktest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/fallbacktest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/fallbacktest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/fallbacktest2.xml b/topics/api-migration/benchmark/data/xinclude/output/fallbacktest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/fallbacktest2.xml
rename to topics/api-migration/benchmark/data/xinclude/output/fallbacktest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/ignoresfragmentid.xml b/topics/api-migration/benchmark/data/xinclude/output/ignoresfragmentid.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/ignoresfragmentid.xml
rename to topics/api-migration/benchmark/data/xinclude/output/ignoresfragmentid.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/includedocumentwithintradocumentreferences.xml b/topics/api-migration/benchmark/data/xinclude/output/includedocumentwithintradocumentreferences.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/includedocumentwithintradocumentreferences.xml
rename to topics/api-migration/benchmark/data/xinclude/output/includedocumentwithintradocumentreferences.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/includefromsamedocumentwithbase.xml b/topics/api-migration/benchmark/data/xinclude/output/includefromsamedocumentwithbase.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/includefromsamedocumentwithbase.xml
rename to topics/api-migration/benchmark/data/xinclude/output/includefromsamedocumentwithbase.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/langtest1.xml b/topics/api-migration/benchmark/data/xinclude/output/langtest1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/langtest1.xml
rename to topics/api-migration/benchmark/data/xinclude/output/langtest1.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/langtest2.xml b/topics/api-migration/benchmark/data/xinclude/output/langtest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/langtest2.xml
rename to topics/api-migration/benchmark/data/xinclude/output/langtest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/langtest3.xml b/topics/api-migration/benchmark/data/xinclude/output/langtest3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/langtest3.xml
rename to topics/api-migration/benchmark/data/xinclude/output/langtest3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/latin1.xml b/topics/api-migration/benchmark/data/xinclude/output/latin1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/latin1.xml
rename to topics/api-migration/benchmark/data/xinclude/output/latin1.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/legalcircle.xml b/topics/api-migration/benchmark/data/xinclude/output/legalcircle.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/legalcircle.xml
rename to topics/api-migration/benchmark/data/xinclude/output/legalcircle.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/lineends.xml b/topics/api-migration/benchmark/data/xinclude/output/lineends.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/lineends.xml
rename to topics/api-migration/benchmark/data/xinclude/output/lineends.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/lowercasealphabet.xml b/topics/api-migration/benchmark/data/xinclude/output/lowercasealphabet.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/lowercasealphabet.xml
rename to topics/api-migration/benchmark/data/xinclude/output/lowercasealphabet.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/lowerpunctuation.xml b/topics/api-migration/benchmark/data/xinclude/output/lowerpunctuation.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/lowerpunctuation.xml
rename to topics/api-migration/benchmark/data/xinclude/output/lowerpunctuation.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/marshtest.xml b/topics/api-migration/benchmark/data/xinclude/output/marshtest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/marshtest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/marshtest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/marshtestwithxmlbase.xml b/topics/api-migration/benchmark/data/xinclude/output/marshtestwithxmlbase.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/marshtestwithxmlbase.xml
rename to topics/api-migration/benchmark/data/xinclude/output/marshtestwithxmlbase.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/metafallbacktest.xml b/topics/api-migration/benchmark/data/xinclude/output/metafallbacktest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/metafallbacktest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/metafallbacktest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/metafallbacktest2.xml b/topics/api-migration/benchmark/data/xinclude/output/metafallbacktest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/metafallbacktest2.xml
rename to topics/api-migration/benchmark/data/xinclude/output/metafallbacktest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/metafallbacktest5.xml b/topics/api-migration/benchmark/data/xinclude/output/metafallbacktest5.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/metafallbacktest5.xml
rename to topics/api-migration/benchmark/data/xinclude/output/metafallbacktest5.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/metafallbacktest6.xml b/topics/api-migration/benchmark/data/xinclude/output/metafallbacktest6.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/metafallbacktest6.xml
rename to topics/api-migration/benchmark/data/xinclude/output/metafallbacktest6.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/metafallbacktestwithxpointer.xml b/topics/api-migration/benchmark/data/xinclude/output/metafallbacktestwithxpointer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/metafallbacktestwithxpointer.xml
rename to topics/api-migration/benchmark/data/xinclude/output/metafallbacktestwithxpointer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/metafallbacktestwithxpointer2.xml b/topics/api-migration/benchmark/data/xinclude/output/metafallbacktestwithxpointer2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/metafallbacktestwithxpointer2.xml
rename to topics/api-migration/benchmark/data/xinclude/output/metafallbacktestwithxpointer2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/metafallbacktotexttest.xml b/topics/api-migration/benchmark/data/xinclude/output/metafallbacktotexttest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/metafallbacktotexttest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/metafallbacktotexttest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/middlepunctuation.xml b/topics/api-migration/benchmark/data/xinclude/output/middlepunctuation.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/middlepunctuation.xml
rename to topics/api-migration/benchmark/data/xinclude/output/middlepunctuation.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/namespacetest.xml b/topics/api-migration/benchmark/data/xinclude/output/namespacetest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/namespacetest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/namespacetest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/numeric.xml b/topics/api-migration/benchmark/data/xinclude/output/numeric.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/numeric.xml
rename to topics/api-migration/benchmark/data/xinclude/output/numeric.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/onlyxpointer.xml b/topics/api-migration/benchmark/data/xinclude/output/onlyxpointer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/onlyxpointer.xml
rename to topics/api-migration/benchmark/data/xinclude/output/onlyxpointer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/paralleltest.xml b/topics/api-migration/benchmark/data/xinclude/output/paralleltest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/paralleltest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/paralleltest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/punctuation.xml b/topics/api-migration/benchmark/data/xinclude/output/punctuation.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/punctuation.xml
rename to topics/api-migration/benchmark/data/xinclude/output/punctuation.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/recursewithinsamedocument.xml b/topics/api-migration/benchmark/data/xinclude/output/recursewithinsamedocument.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/recursewithinsamedocument.xml
rename to topics/api-migration/benchmark/data/xinclude/output/recursewithinsamedocument.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/relative.xml b/topics/api-migration/benchmark/data/xinclude/output/relative.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/relative.xml
rename to topics/api-migration/benchmark/data/xinclude/output/relative.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/resolvethruxpointer.xml b/topics/api-migration/benchmark/data/xinclude/output/resolvethruxpointer.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/resolvethruxpointer.xml
rename to topics/api-migration/benchmark/data/xinclude/output/resolvethruxpointer.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/roottest.xml b/topics/api-migration/benchmark/data/xinclude/output/roottest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/roottest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/roottest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/roottest2.xml b/topics/api-migration/benchmark/data/xinclude/output/roottest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/roottest2.xml
rename to topics/api-migration/benchmark/data/xinclude/output/roottest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/simple.xml b/topics/api-migration/benchmark/data/xinclude/output/simple.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/simple.xml
rename to topics/api-migration/benchmark/data/xinclude/output/simple.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/test.xml b/topics/api-migration/benchmark/data/xinclude/output/test.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/test.xml
rename to topics/api-migration/benchmark/data/xinclude/output/test.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/tobintop.xml b/topics/api-migration/benchmark/data/xinclude/output/tobintop.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/tobintop.xml
rename to topics/api-migration/benchmark/data/xinclude/output/tobintop.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/triple.xml b/topics/api-migration/benchmark/data/xinclude/output/triple.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/triple.xml
rename to topics/api-migration/benchmark/data/xinclude/output/triple.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/unrecognizedschemewithfallback.xml b/topics/api-migration/benchmark/data/xinclude/output/unrecognizedschemewithfallback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/unrecognizedschemewithfallback.xml
rename to topics/api-migration/benchmark/data/xinclude/output/unrecognizedschemewithfallback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/uppercasealphabet.xml b/topics/api-migration/benchmark/data/xinclude/output/uppercasealphabet.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/uppercasealphabet.xml
rename to topics/api-migration/benchmark/data/xinclude/output/uppercasealphabet.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/utf16.txt b/topics/api-migration/benchmark/data/xinclude/output/utf16.txt
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/utf16.txt
rename to topics/api-migration/benchmark/data/xinclude/output/utf16.txt
diff --git a/topics/apimigration/benchmark/data/xinclude/output/utf16.xml b/topics/api-migration/benchmark/data/xinclude/output/utf16.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/utf16.xml
rename to topics/api-migration/benchmark/data/xinclude/output/utf16.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xmlbasetest.xml b/topics/api-migration/benchmark/data/xinclude/output/xmlbasetest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xmlbasetest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xmlbasetest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xmlbasetest2.xml b/topics/api-migration/benchmark/data/xinclude/output/xmlbasetest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xmlbasetest2.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xmlbasetest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xmlbasetest3.xml b/topics/api-migration/benchmark/data/xinclude/output/xmlbasetest3.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xmlbasetest3.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xmlbasetest3.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xmlidtest.xml b/topics/api-migration/benchmark/data/xinclude/output/xmlidtest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xmlidtest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xmlidtest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xpointeroverridesfragmentid.xml b/topics/api-migration/benchmark/data/xinclude/output/xpointeroverridesfragmentid.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xpointeroverridesfragmentid.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xpointeroverridesfragmentid.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xptrdandtumblertest.xml b/topics/api-migration/benchmark/data/xinclude/output/xptrdandtumblertest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xptrdandtumblertest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xptrdandtumblertest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xptrdoubleelementtest.xml b/topics/api-migration/benchmark/data/xinclude/output/xptrdoubleelementtest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xptrdoubleelementtest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xptrdoubleelementtest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xptrfallback.xml b/topics/api-migration/benchmark/data/xinclude/output/xptrfallback.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xptrfallback.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xptrfallback.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xptridandtumblertest.xml b/topics/api-migration/benchmark/data/xinclude/output/xptridandtumblertest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xptridandtumblertest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xptridandtumblertest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xptridtest.xml b/topics/api-migration/benchmark/data/xinclude/output/xptridtest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xptridtest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xptridtest.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xptridtest2.xml b/topics/api-migration/benchmark/data/xinclude/output/xptridtest2.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xptridtest2.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xptridtest2.xml
diff --git a/topics/apimigration/benchmark/data/xinclude/output/xptrtumblertest.xml b/topics/api-migration/benchmark/data/xinclude/output/xptrtumblertest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xinclude/output/xptrtumblertest.xml
rename to topics/api-migration/benchmark/data/xinclude/output/xptrtumblertest.xml
diff --git a/topics/apimigration/benchmark/data/xmlbasetest.xml b/topics/api-migration/benchmark/data/xmlbasetest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlbasetest.xml
rename to topics/api-migration/benchmark/data/xmlbasetest.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/catalog.xml b/topics/api-migration/benchmark/data/xmlid/catalog.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/catalog.xml
rename to topics/api-migration/benchmark/data/xmlid/catalog.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/001_normalize.xml b/topics/api-migration/benchmark/data/xmlid/tests/001_normalize.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/001_normalize.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/001_normalize.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/002_undecl.xml b/topics/api-migration/benchmark/data/xmlid/tests/002_undecl.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/002_undecl.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/002_undecl.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/003_dtd.xml b/topics/api-migration/benchmark/data/xmlid/tests/003_dtd.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/003_dtd.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/003_dtd.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/004_schema.xml b/topics/api-migration/benchmark/data/xmlid/tests/004_schema.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/004_schema.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/004_schema.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/005_errdtdbad.xml b/topics/api-migration/benchmark/data/xmlid/tests/005_errdtdbad.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/005_errdtdbad.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/005_errdtdbad.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/005_errdup.xml b/topics/api-migration/benchmark/data/xmlid/tests/005_errdup.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/005_errdup.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/005_errdup.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/006_errschemabad.xml b/topics/api-migration/benchmark/data/xmlid/tests/006_errschemabad.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/006_errschemabad.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/006_errschemabad.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/007_errdup.xml b/topics/api-migration/benchmark/data/xmlid/tests/007_errdup.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/007_errdup.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/007_errdup.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/008_ok10.xml b/topics/api-migration/benchmark/data/xmlid/tests/008_ok10.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/008_ok10.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/008_ok10.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/009_ok11.xml b/topics/api-migration/benchmark/data/xmlid/tests/009_ok11.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/009_ok11.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/009_ok11.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/010_okxref.xml b/topics/api-migration/benchmark/data/xmlid/tests/010_okxref.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/010_okxref.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/010_okxref.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/011_oknormalize.xml b/topics/api-migration/benchmark/data/xmlid/tests/011_oknormalize.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/011_oknormalize.xml
rename to topics/api-migration/benchmark/data/xmlid/tests/011_oknormalize.xml
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/badschema.xsd b/topics/api-migration/benchmark/data/xmlid/tests/badschema.xsd
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/badschema.xsd
rename to topics/api-migration/benchmark/data/xmlid/tests/badschema.xsd
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/badxml.xsd b/topics/api-migration/benchmark/data/xmlid/tests/badxml.xsd
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/badxml.xsd
rename to topics/api-migration/benchmark/data/xmlid/tests/badxml.xsd
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/schema.xsd b/topics/api-migration/benchmark/data/xmlid/tests/schema.xsd
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/schema.xsd
rename to topics/api-migration/benchmark/data/xmlid/tests/schema.xsd
diff --git a/topics/apimigration/benchmark/data/xmlid/tests/xml.xsd b/topics/api-migration/benchmark/data/xmlid/tests/xml.xsd
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlid/tests/xml.xsd
rename to topics/api-migration/benchmark/data/xmlid/tests/xml.xsd
diff --git a/topics/apimigration/benchmark/data/xmlspacetest.xml b/topics/api-migration/benchmark/data/xmlspacetest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xmlspacetest.xml
rename to topics/api-migration/benchmark/data/xmlspacetest.xml
diff --git a/topics/apimigration/benchmark/data/xslt/debug/8-12.xml b/topics/api-migration/benchmark/data/xslt/debug/8-12.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/debug/8-12.xml
rename to topics/api-migration/benchmark/data/xslt/debug/8-12.xml
diff --git a/topics/apimigration/benchmark/data/xslt/debug/8-15.xml b/topics/api-migration/benchmark/data/xslt/debug/8-15.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/debug/8-15.xml
rename to topics/api-migration/benchmark/data/xslt/debug/8-15.xml
diff --git a/topics/apimigration/benchmark/data/xslt/debug/8-8.xml b/topics/api-migration/benchmark/data/xslt/debug/8-8.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/debug/8-8.xml
rename to topics/api-migration/benchmark/data/xslt/debug/8-8.xml
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-1.xml b/topics/api-migration/benchmark/data/xslt/input/8-1.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-1.xml
rename to topics/api-migration/benchmark/data/xslt/input/8-1.xml
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-10.xsl b/topics/api-migration/benchmark/data/xslt/input/8-10.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-10.xsl
rename to topics/api-migration/benchmark/data/xslt/input/8-10.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-12.xsl b/topics/api-migration/benchmark/data/xslt/input/8-12.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-12.xsl
rename to topics/api-migration/benchmark/data/xslt/input/8-12.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-14.xml b/topics/api-migration/benchmark/data/xslt/input/8-14.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-14.xml
rename to topics/api-migration/benchmark/data/xslt/input/8-14.xml
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-15.xsl b/topics/api-migration/benchmark/data/xslt/input/8-15.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-15.xsl
rename to topics/api-migration/benchmark/data/xslt/input/8-15.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-2.xsl b/topics/api-migration/benchmark/data/xslt/input/8-2.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-2.xsl
rename to topics/api-migration/benchmark/data/xslt/input/8-2.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-4.xsl b/topics/api-migration/benchmark/data/xslt/input/8-4.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-4.xsl
rename to topics/api-migration/benchmark/data/xslt/input/8-4.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-5.xsl b/topics/api-migration/benchmark/data/xslt/input/8-5.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-5.xsl
rename to topics/api-migration/benchmark/data/xslt/input/8-5.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-6.xsl b/topics/api-migration/benchmark/data/xslt/input/8-6.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-6.xsl
rename to topics/api-migration/benchmark/data/xslt/input/8-6.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-7.xsl b/topics/api-migration/benchmark/data/xslt/input/8-7.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-7.xsl
rename to topics/api-migration/benchmark/data/xslt/input/8-7.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/8-8.xsl b/topics/api-migration/benchmark/data/xslt/input/8-8.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/8-8.xsl
rename to topics/api-migration/benchmark/data/xslt/input/8-8.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/commentwithparent.xsl b/topics/api-migration/benchmark/data/xslt/input/commentwithparent.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/commentwithparent.xsl
rename to topics/api-migration/benchmark/data/xslt/input/commentwithparent.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/fragment.xsl b/topics/api-migration/benchmark/data/xslt/input/fragment.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/fragment.xsl
rename to topics/api-migration/benchmark/data/xslt/input/fragment.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/id_transform.xsl b/topics/api-migration/benchmark/data/xslt/input/id_transform.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/id_transform.xsl
rename to topics/api-migration/benchmark/data/xslt/input/id_transform.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/identity.xsl b/topics/api-migration/benchmark/data/xslt/input/identity.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/identity.xsl
rename to topics/api-migration/benchmark/data/xslt/input/identity.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/illegaltransform.xsl b/topics/api-migration/benchmark/data/xslt/input/illegaltransform.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/illegaltransform.xsl
rename to topics/api-migration/benchmark/data/xslt/input/illegaltransform.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/namespaceparamtest.xsl b/topics/api-migration/benchmark/data/xslt/input/namespaceparamtest.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/namespaceparamtest.xsl
rename to topics/api-migration/benchmark/data/xslt/input/namespaceparamtest.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/paramtest.xsl b/topics/api-migration/benchmark/data/xslt/input/paramtest.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/paramtest.xsl
rename to topics/api-migration/benchmark/data/xslt/input/paramtest.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/piwithparent.xsl b/topics/api-migration/benchmark/data/xslt/input/piwithparent.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/piwithparent.xsl
rename to topics/api-migration/benchmark/data/xslt/input/piwithparent.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/singlestring.xsl b/topics/api-migration/benchmark/data/xslt/input/singlestring.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/singlestring.xsl
rename to topics/api-migration/benchmark/data/xslt/input/singlestring.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/input/textmethod.xsl b/topics/api-migration/benchmark/data/xslt/input/textmethod.xsl
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/input/textmethod.xsl
rename to topics/api-migration/benchmark/data/xslt/input/textmethod.xsl
diff --git a/topics/apimigration/benchmark/data/xslt/output/8-12.xml b/topics/api-migration/benchmark/data/xslt/output/8-12.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/output/8-12.xml
rename to topics/api-migration/benchmark/data/xslt/output/8-12.xml
diff --git a/topics/apimigration/benchmark/data/xslt/output/8-15.xml b/topics/api-migration/benchmark/data/xslt/output/8-15.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/output/8-15.xml
rename to topics/api-migration/benchmark/data/xslt/output/8-15.xml
diff --git a/topics/apimigration/benchmark/data/xslt/output/8-8.xml b/topics/api-migration/benchmark/data/xslt/output/8-8.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/output/8-8.xml
rename to topics/api-migration/benchmark/data/xslt/output/8-8.xml
diff --git a/topics/apimigration/benchmark/data/xslt/output/8-8c.xml b/topics/api-migration/benchmark/data/xslt/output/8-8c.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xslt/output/8-8c.xml
rename to topics/api-migration/benchmark/data/xslt/output/8-8c.xml
diff --git a/topics/apimigration/benchmark/data/xtest.xml b/topics/api-migration/benchmark/data/xtest.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/xtest.xml
rename to topics/api-migration/benchmark/data/xtest.xml
diff --git a/topics/apimigration/benchmark/data/{file}.xml b/topics/api-migration/benchmark/data/{file}.xml
similarity index 100%
rename from topics/apimigration/benchmark/data/{file}.xml
rename to topics/api-migration/benchmark/data/{file}.xml
diff --git a/topics/apimigration/benchmark/deps/junit-4.5.jar b/topics/api-migration/benchmark/deps/junit-4.5.jar
similarity index 100%
rename from topics/apimigration/benchmark/deps/junit-4.5.jar
rename to topics/api-migration/benchmark/deps/junit-4.5.jar
diff --git a/topics/apimigration/benchmark/dommapping.tex b/topics/api-migration/benchmark/dommapping.tex
similarity index 100%
rename from topics/apimigration/benchmark/dommapping.tex
rename to topics/api-migration/benchmark/dommapping.tex
diff --git a/topics/apimigration/benchmark/failures.txt b/topics/api-migration/benchmark/failures.txt
similarity index 100%
rename from topics/apimigration/benchmark/failures.txt
rename to topics/api-migration/benchmark/failures.txt
diff --git a/topics/apimigration/benchmark/implmapping.tex b/topics/api-migration/benchmark/implmapping.tex
similarity index 100%
rename from topics/apimigration/benchmark/implmapping.tex
rename to topics/api-migration/benchmark/implmapping.tex
diff --git a/topics/apimigration/benchmark/issues.tex b/topics/api-migration/benchmark/issues.tex
similarity index 100%
rename from topics/apimigration/benchmark/issues.tex
rename to topics/api-migration/benchmark/issues.tex
diff --git a/topics/apimigration/benchmark/jdomapi.tex b/topics/api-migration/benchmark/jdomapi.tex
similarity index 100%
rename from topics/apimigration/benchmark/jdomapi.tex
rename to topics/api-migration/benchmark/jdomapi.tex
diff --git a/topics/apimigration/benchmark/jdompkgstats.tex b/topics/api-migration/benchmark/jdompkgstats.tex
similarity index 100%
rename from topics/apimigration/benchmark/jdompkgstats.tex
rename to topics/api-migration/benchmark/jdompkgstats.tex
diff --git a/topics/apimigration/benchmark/mappings.csv b/topics/api-migration/benchmark/mappings.csv
similarity index 100%
rename from topics/apimigration/benchmark/mappings.csv
rename to topics/api-migration/benchmark/mappings.csv
diff --git a/topics/apimigration/benchmark/pkgstats.tex b/topics/api-migration/benchmark/pkgstats.tex
similarity index 100%
rename from topics/apimigration/benchmark/pkgstats.tex
rename to topics/api-migration/benchmark/pkgstats.tex
diff --git a/topics/apimigration/benchmark/pkgstats.xml b/topics/api-migration/benchmark/pkgstats.xml
similarity index 100%
rename from topics/apimigration/benchmark/pkgstats.xml
rename to topics/api-migration/benchmark/pkgstats.xml
diff --git a/topics/apimigration/benchmark/pkgstats.zip b/topics/api-migration/benchmark/pkgstats.zip
similarity index 100%
rename from topics/apimigration/benchmark/pkgstats.zip
rename to topics/api-migration/benchmark/pkgstats.zip
diff --git a/topics/apimigration/benchmark/requirements b/topics/api-migration/benchmark/requirements
similarity index 100%
rename from topics/apimigration/benchmark/requirements
rename to topics/api-migration/benchmark/requirements
diff --git a/topics/apimigration/benchmark/resources/company.xml b/topics/api-migration/benchmark/resources/company.xml
similarity index 100%
rename from topics/apimigration/benchmark/resources/company.xml
rename to topics/api-migration/benchmark/resources/company.xml
diff --git a/topics/apimigration/benchmark/resources/company.xsd b/topics/api-migration/benchmark/resources/company.xsd
similarity index 100%
rename from topics/apimigration/benchmark/resources/company.xsd
rename to topics/api-migration/benchmark/resources/company.xsd
diff --git a/topics/apimigration/benchmark/resources/contacts.xml b/topics/api-migration/benchmark/resources/contacts.xml
similarity index 100%
rename from topics/apimigration/benchmark/resources/contacts.xml
rename to topics/api-migration/benchmark/resources/contacts.xml
diff --git a/topics/apimigration/benchmark/resources/contacts.xsd b/topics/api-migration/benchmark/resources/contacts.xsd
similarity index 100%
rename from topics/apimigration/benchmark/resources/contacts.xsd
rename to topics/api-migration/benchmark/resources/contacts.xsd
diff --git a/topics/apimigration/benchmark/resources/result.xml b/topics/api-migration/benchmark/resources/result.xml
similarity index 100%
rename from topics/apimigration/benchmark/resources/result.xml
rename to topics/api-migration/benchmark/resources/result.xml
diff --git a/topics/apimigration/benchmark/samples.ods b/topics/api-migration/benchmark/samples.ods
similarity index 100%
rename from topics/apimigration/benchmark/samples.ods
rename to topics/api-migration/benchmark/samples.ods
diff --git a/topics/apimigration/benchmark/samples.tex b/topics/api-migration/benchmark/samples.tex
similarity index 100%
rename from topics/apimigration/benchmark/samples.tex
rename to topics/api-migration/benchmark/samples.tex
diff --git a/topics/apimigration/benchmark/samplestest.aux b/topics/api-migration/benchmark/samplestest.aux
similarity index 100%
rename from topics/apimigration/benchmark/samplestest.aux
rename to topics/api-migration/benchmark/samplestest.aux
diff --git a/topics/apimigration/benchmark/samplestest.pdf b/topics/api-migration/benchmark/samplestest.pdf
similarity index 100%
rename from topics/apimigration/benchmark/samplestest.pdf
rename to topics/api-migration/benchmark/samplestest.pdf
diff --git a/topics/apimigration/benchmark/samplestest.tex b/topics/api-migration/benchmark/samplestest.tex
similarity index 100%
rename from topics/apimigration/benchmark/samplestest.tex
rename to topics/api-migration/benchmark/samplestest.tex
diff --git a/topics/apimigration/benchmark/src/META-INF/aop-ajc.xml b/topics/api-migration/benchmark/src/META-INF/aop-ajc.xml
similarity index 100%
rename from topics/apimigration/benchmark/src/META-INF/aop-ajc.xml
rename to topics/api-migration/benchmark/src/META-INF/aop-ajc.xml
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/APIStats2LaTeX.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/APIStats2LaTeX.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/APIStats2LaTeX.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/APIStats2LaTeX.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectFailures.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectFailures.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectFailures.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectFailures.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectFailuresXOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectFailuresXOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectFailuresXOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectFailuresXOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectMappings.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectMappings.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectMappings.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/CollectMappings.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/InterceptTestFailure.aj b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/InterceptTestFailure.aj
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/InterceptTestFailure.aj
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/InterceptTestFailure.aj
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/PKGStats2LaTeX.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/PKGStats2LaTeX.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/PKGStats2LaTeX.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/PKGStats2LaTeX.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/Row.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/Row.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/Row.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/Row.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/TestStats2LaTeX.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/TestStats2LaTeX.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/TestStats2LaTeX.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/analysis/TestStats2LaTeX.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/API.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/API.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/API.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/API.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/FailingWrappedMethods.aj b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/FailingWrappedMethods.aj
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/FailingWrappedMethods.aj
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/FailingWrappedMethods.aj
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Issue.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Issue.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Issue.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Issue.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/MapsTo.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/MapsTo.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/MapsTo.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/MapsTo.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Progress.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Progress.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Progress.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Progress.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Solution.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Solution.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Solution.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Solution.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Unresolved.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Unresolved.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Unresolved.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Unresolved.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Wrapping.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Wrapping.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Wrapping.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/anno/Wrapping.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingContactsUsingDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingContactsUsingDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingContactsUsingDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingContactsUsingDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingSalariesUsingDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingSalariesUsingDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingSalariesUsingDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingSalariesUsingDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingSalariesUsingDOMWrappedAsJDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingSalariesUsingDOMWrappedAsJDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingSalariesUsingDOMWrappedAsJDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/AccessingSalariesUsingDOMWrappedAsJDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/ContactsToDocumentUsingDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/ContactsToDocumentUsingDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/ContactsToDocumentUsingDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/ContactsToDocumentUsingDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/ContactsToDocumentUsingDOMWrappedAsJDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/ContactsToDocumentUsingDOMWrappedAsJDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/ContactsToDocumentUsingDOMWrappedAsJDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/ContactsToDocumentUsingDOMWrappedAsJDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/DocumentToContactsUsingDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/DocumentToContactsUsingDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/DocumentToContactsUsingDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/DocumentToContactsUsingDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/DocumentToContactsUsingDOMWrappedAsJDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/DocumentToContactsUsingDOMWrappedAsJDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/DocumentToContactsUsingDOMWrappedAsJDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/DocumentToContactsUsingDOMWrappedAsJDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Content.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Content.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Content.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Content.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Document.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Document.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Document.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Document.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Element.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Element.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Element.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Element.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/ElementFilter.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/ElementFilter.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/ElementFilter.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/ElementFilter.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Namespace.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Namespace.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Namespace.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom/wrapped_as_jdom/Namespace.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/AccessingSalariesUsingDOM4J.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/AccessingSalariesUsingDOM4J.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/AccessingSalariesUsingDOM4J.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/AccessingSalariesUsingDOM4J.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/ContactsToDocumentUsingDOM4J.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/ContactsToDocumentUsingDOM4J.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/ContactsToDocumentUsingDOM4J.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/ContactsToDocumentUsingDOM4J.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/DocumentToContactUsingDOM4J.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/DocumentToContactUsingDOM4J.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/DocumentToContactUsingDOM4J.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/dom4j/DocumentToContactUsingDOM4J.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/AccessingSalariesUsingJAXB.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/AccessingSalariesUsingJAXB.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/AccessingSalariesUsingJAXB.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/AccessingSalariesUsingJAXB.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/ContactsToDocumentUsingJAXB.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/ContactsToDocumentUsingJAXB.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/ContactsToDocumentUsingJAXB.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/ContactsToDocumentUsingJAXB.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Company.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Company.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Company.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Company.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Dept.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Dept.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Dept.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Dept.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Employee.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Employee.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Employee.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Employee.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/ObjectFactory.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/ObjectFactory.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/ObjectFactory.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/ObjectFactory.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Person.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Person.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Person.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Person.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Subunit.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Subunit.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Subunit.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/Subunit.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/package-info.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/package-info.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/package-info.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/company/package-info.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/ObjectFactory.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/ObjectFactory.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/ObjectFactory.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/ObjectFactory.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/XContacts.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/XContacts.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/XContacts.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/XContacts.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/XPerson.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/XPerson.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/XPerson.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jaxb/contacts/XPerson.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/AccessingContactsUsingJDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/AccessingContactsUsingJDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/AccessingContactsUsingJDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/AccessingContactsUsingJDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/AccessingSalariesUsingJDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/AccessingSalariesUsingJDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/AccessingSalariesUsingJDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/AccessingSalariesUsingJDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/ContactsToDocumentUsingJDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/ContactsToDocumentUsingJDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/ContactsToDocumentUsingJDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/ContactsToDocumentUsingJDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/ContactsToDocumentUsingJDOMWrappedAsDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/ContactsToDocumentUsingJDOMWrappedAsDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/ContactsToDocumentUsingJDOMWrappedAsDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/ContactsToDocumentUsingJDOMWrappedAsDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/DocumentToContactsUsingJDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/DocumentToContactsUsingJDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/DocumentToContactsUsingJDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/DocumentToContactsUsingJDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/DocumentToContactsUsingJDOMWrappedAsDOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/DocumentToContactsUsingJDOMWrappedAsDOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/DocumentToContactsUsingJDOMWrappedAsDOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/DocumentToContactsUsingJDOMWrappedAsDOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/AttributeTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/AttributeTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/AttributeTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/AttributeTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/AttributeTypeTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/AttributeTypeTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/AttributeTypeTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/AttributeTypeTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/BaseURITest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/BaseURITest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/BaseURITest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/BaseURITest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/BuilderTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/BuilderTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/BuilderTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/BuilderTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/CommentTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/CommentTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/CommentTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/CommentTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/DocTypeTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/DocTypeTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/DocTypeTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/DocTypeTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/DocumentTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/DocumentTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/DocumentTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/DocumentTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ElementTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ElementTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ElementTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ElementTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/LeafNodeTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/LeafNodeTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/LeafNodeTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/LeafNodeTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NamespaceNodeTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NamespaceNodeTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NamespaceNodeTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NamespaceNodeTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NamespacesTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NamespacesTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NamespacesTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NamespacesTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NodesTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NodesTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NodesTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/NodesTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ParentNodeTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ParentNodeTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ParentNodeTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ParentNodeTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ProcessingInstructionTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ProcessingInstructionTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ProcessingInstructionTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/ProcessingInstructionTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/TextTest.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/TextTest.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/TextTest.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/TextTest.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/XOMTestCase.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/XOMTestCase.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/XOMTestCase.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/test_as_xom/XOMTestCase.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/DOMImplementation.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/DOMImplementation.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/DOMImplementation.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/DOMImplementation.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Document.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Document.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Document.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Document.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Element.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Element.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Element.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Element.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Node.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Node.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Node.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/Node.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/NodeList.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/NodeList.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/NodeList.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/NodeList.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/wrapped.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/wrapped.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/wrapped.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_dom/wrapped.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Attribute.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Attribute.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Attribute.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Attribute.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Builder.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Builder.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Builder.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Builder.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Comment.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Comment.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Comment.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Comment.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/CycleException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/CycleException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/CycleException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/CycleException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/DocType.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/DocType.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/DocType.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/DocType.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Document.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Document.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Document.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Document.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Element.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Element.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Element.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Element.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Elements.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Elements.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Elements.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Elements.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalAddException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalAddException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalAddException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalAddException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalCharacterDataException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalCharacterDataException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalCharacterDataException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalCharacterDataException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalDataException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalDataException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalDataException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalDataException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalNameException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalNameException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalNameException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalNameException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalTargetException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalTargetException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalTargetException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/IllegalTargetException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/LocatorFilter.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/LocatorFilter.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/LocatorFilter.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/LocatorFilter.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/MalformedURIException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/MalformedURIException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/MalformedURIException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/MalformedURIException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/MultipleParentException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/MultipleParentException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/MultipleParentException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/MultipleParentException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Namespace.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Namespace.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Namespace.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Namespace.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NamespaceConflictException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NamespaceConflictException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NamespaceConflictException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NamespaceConflictException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NoSuchAttributeException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NoSuchAttributeException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NoSuchAttributeException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NoSuchAttributeException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NoSuchChildException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NoSuchChildException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NoSuchChildException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NoSuchChildException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Node.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Node.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Node.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Node.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NodeFactory.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NodeFactory.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NodeFactory.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/NodeFactory.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Nodes.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Nodes.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Nodes.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Nodes.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ParentNode.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ParentNode.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ParentNode.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ParentNode.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ParsingException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ParsingException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ParsingException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ParsingException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ProcessingInstruction.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ProcessingInstruction.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ProcessingInstruction.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ProcessingInstruction.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Serializer.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Serializer.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Serializer.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Serializer.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Text.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Text.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Text.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Text.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Utils.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Utils.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Utils.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/Utils.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ValidityException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ValidityException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ValidityException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/ValidityException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/WellformednessException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/WellformednessException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/WellformednessException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/WellformednessException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XMLException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XMLException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XMLException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XMLException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XPathContext.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XPathContext.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XPathContext.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XPathContext.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XPathException.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XPathException.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XPathException.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/jdom/wrapped_as_xom/XPathException.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/AccessingSalariesUsingSAX.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/AccessingSalariesUsingSAX.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/AccessingSalariesUsingSAX.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/AccessingSalariesUsingSAX.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/ContactsToDocumentUsingSAX.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/ContactsToDocumentUsingSAX.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/ContactsToDocumentUsingSAX.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/ContactsToDocumentUsingSAX.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/DocumentToContactsUsingSAX.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/DocumentToContactsUsingSAX.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/DocumentToContactsUsingSAX.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/sax/DocumentToContactsUsingSAX.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/AbstractIncreaseSalaries.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/AbstractIncreaseSalaries.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/AbstractIncreaseSalaries.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/AbstractIncreaseSalaries.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/Resources.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/Resources.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/Resources.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/Resources.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/TestAccessingImplementations.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/TestAccessingImplementations.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/TestAccessingImplementations.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/accessing/TestAccessingImplementations.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/AllTests.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/AllTests.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/AllTests.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/AllTests.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/Base.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/Base.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/Base.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/Base.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/ContactsToDocument.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/ContactsToDocument.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/ContactsToDocument.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/ContactsToDocument.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/DocumentToContacts.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/DocumentToContacts.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/DocumentToContacts.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/DocumentToContacts.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/Person.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/Person.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/Person.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/Person.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/TestContactsToDocument.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/TestContactsToDocument.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/TestContactsToDocument.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/TestContactsToDocument.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/TestDocumentToContacts.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/TestDocumentToContacts.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/TestDocumentToContacts.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/scenarios/xo_mapping/TestDocumentToContacts.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/xom/ContactsToDocumentUsingXOM.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/xom/ContactsToDocumentUsingXOM.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/benchmark/xom/ContactsToDocumentUsingXOM.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/benchmark/xom/ContactsToDocumentUsingXOM.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/examples/DetachingIssues.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/examples/DetachingIssues.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/examples/DetachingIssues.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/examples/DetachingIssues.java
diff --git a/topics/apimigration/benchmark/src/org/planet_sl/apimigration/examples/NamespaceIssues.java b/topics/api-migration/benchmark/src/org/planet_sl/apimigration/examples/NamespaceIssues.java
similarity index 100%
rename from topics/apimigration/benchmark/src/org/planet_sl/apimigration/examples/NamespaceIssues.java
rename to topics/api-migration/benchmark/src/org/planet_sl/apimigration/examples/NamespaceIssues.java
diff --git a/topics/apimigration/benchmark/teststats.tex b/topics/api-migration/benchmark/teststats.tex
similarity index 100%
rename from topics/apimigration/benchmark/teststats.tex
rename to topics/api-migration/benchmark/teststats.tex
diff --git a/topics/apimigration/benchmark/teststats.xml b/topics/api-migration/benchmark/teststats.xml
similarity index 100%
rename from topics/apimigration/benchmark/teststats.xml
rename to topics/api-migration/benchmark/teststats.xml
diff --git a/topics/apimigration/benchmark/unrissues.tex b/topics/api-migration/benchmark/unrissues.tex
similarity index 100%
rename from topics/apimigration/benchmark/unrissues.tex
rename to topics/api-migration/benchmark/unrissues.tex
diff --git a/topics/apimigration/benchmark/xomapi.tex b/topics/api-migration/benchmark/xomapi.tex
similarity index 100%
rename from topics/apimigration/benchmark/xomapi.tex
rename to topics/api-migration/benchmark/xomapi.tex
diff --git a/topics/apimigration/benchmark/xompkgstats.tex b/topics/api-migration/benchmark/xompkgstats.tex
similarity index 100%
rename from topics/apimigration/benchmark/xompkgstats.tex
rename to topics/api-migration/benchmark/xompkgstats.tex
diff --git a/topics/apimigration/protocol/framework/AnnotateJimple.asf b/topics/api-migration/protocol/framework/AnnotateJimple.asf
similarity index 100%
rename from topics/apimigration/protocol/framework/AnnotateJimple.asf
rename to topics/api-migration/protocol/framework/AnnotateJimple.asf
diff --git a/topics/apimigration/protocol/framework/AnnotateJimple.sdf b/topics/api-migration/protocol/framework/AnnotateJimple.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/AnnotateJimple.sdf
rename to topics/api-migration/protocol/framework/AnnotateJimple.sdf
diff --git a/topics/apimigration/protocol/framework/ExtractTrace.asf b/topics/api-migration/protocol/framework/ExtractTrace.asf
similarity index 100%
rename from topics/apimigration/protocol/framework/ExtractTrace.asf
rename to topics/api-migration/protocol/framework/ExtractTrace.asf
diff --git a/topics/apimigration/protocol/framework/ExtractTrace.sdf b/topics/api-migration/protocol/framework/ExtractTrace.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/ExtractTrace.sdf
rename to topics/api-migration/protocol/framework/ExtractTrace.sdf
diff --git a/topics/apimigration/protocol/framework/Matching.asf b/topics/api-migration/protocol/framework/Matching.asf
similarity index 100%
rename from topics/apimigration/protocol/framework/Matching.asf
rename to topics/api-migration/protocol/framework/Matching.asf
diff --git a/topics/apimigration/protocol/framework/Matching.sdf b/topics/api-migration/protocol/framework/Matching.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/Matching.sdf
rename to topics/api-migration/protocol/framework/Matching.sdf
diff --git a/topics/apimigration/protocol/framework/Memory.asf b/topics/api-migration/protocol/framework/Memory.asf
similarity index 100%
rename from topics/apimigration/protocol/framework/Memory.asf
rename to topics/api-migration/protocol/framework/Memory.asf
diff --git a/topics/apimigration/protocol/framework/Memory.sdf b/topics/api-migration/protocol/framework/Memory.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/Memory.sdf
rename to topics/api-migration/protocol/framework/Memory.sdf
diff --git a/topics/apimigration/protocol/framework/Patterns.sdf b/topics/api-migration/protocol/framework/Patterns.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/Patterns.sdf
rename to topics/api-migration/protocol/framework/Patterns.sdf
diff --git a/topics/apimigration/protocol/framework/README b/topics/api-migration/protocol/framework/README
similarity index 100%
rename from topics/apimigration/protocol/framework/README
rename to topics/api-migration/protocol/framework/README
diff --git a/topics/apimigration/protocol/framework/Trace2Term.asf b/topics/api-migration/protocol/framework/Trace2Term.asf
similarity index 100%
rename from topics/apimigration/protocol/framework/Trace2Term.asf
rename to topics/api-migration/protocol/framework/Trace2Term.asf
diff --git a/topics/apimigration/protocol/framework/Trace2Term.sdf b/topics/api-migration/protocol/framework/Trace2Term.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/Trace2Term.sdf
rename to topics/api-migration/protocol/framework/Trace2Term.sdf
diff --git a/topics/apimigration/protocol/framework/Tracing.asf b/topics/api-migration/protocol/framework/Tracing.asf
similarity index 100%
rename from topics/apimigration/protocol/framework/Tracing.asf
rename to topics/api-migration/protocol/framework/Tracing.asf
diff --git a/topics/apimigration/protocol/framework/Tracing.sdf b/topics/api-migration/protocol/framework/Tracing.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/Tracing.sdf
rename to topics/api-migration/protocol/framework/Tracing.sdf
diff --git a/topics/apimigration/protocol/framework/ZipTrace.asf b/topics/api-migration/protocol/framework/ZipTrace.asf
similarity index 100%
rename from topics/apimigration/protocol/framework/ZipTrace.asf
rename to topics/api-migration/protocol/framework/ZipTrace.asf
diff --git a/topics/apimigration/protocol/framework/ZipTrace.sdf b/topics/api-migration/protocol/framework/ZipTrace.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/ZipTrace.sdf
rename to topics/api-migration/protocol/framework/ZipTrace.sdf
diff --git a/topics/apimigration/protocol/framework/annotate.sh b/topics/api-migration/protocol/framework/annotate.sh
similarity index 100%
rename from topics/apimigration/protocol/framework/annotate.sh
rename to topics/api-migration/protocol/framework/annotate.sh
diff --git a/topics/apimigration/protocol/framework/languages/jimple/LICENSE b/topics/api-migration/protocol/framework/languages/jimple/LICENSE
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/LICENSE
rename to topics/api-migration/protocol/framework/languages/jimple/LICENSE
diff --git a/topics/apimigration/protocol/framework/languages/jimple/syntax/Expressions.sdf b/topics/api-migration/protocol/framework/languages/jimple/syntax/Expressions.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/syntax/Expressions.sdf
rename to topics/api-migration/protocol/framework/languages/jimple/syntax/Expressions.sdf
diff --git a/topics/apimigration/protocol/framework/languages/jimple/syntax/Jimple.sdf b/topics/api-migration/protocol/framework/languages/jimple/syntax/Jimple.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/syntax/Jimple.sdf
rename to topics/api-migration/protocol/framework/languages/jimple/syntax/Jimple.sdf
diff --git a/topics/apimigration/protocol/framework/languages/jimple/syntax/Keywords.sdf b/topics/api-migration/protocol/framework/languages/jimple/syntax/Keywords.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/syntax/Keywords.sdf
rename to topics/api-migration/protocol/framework/languages/jimple/syntax/Keywords.sdf
diff --git a/topics/apimigration/protocol/framework/languages/jimple/syntax/Lexical.sdf b/topics/api-migration/protocol/framework/languages/jimple/syntax/Lexical.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/syntax/Lexical.sdf
rename to topics/api-migration/protocol/framework/languages/jimple/syntax/Lexical.sdf
diff --git a/topics/apimigration/protocol/framework/languages/jimple/syntax/Main.sdf b/topics/api-migration/protocol/framework/languages/jimple/syntax/Main.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/syntax/Main.sdf
rename to topics/api-migration/protocol/framework/languages/jimple/syntax/Main.sdf
diff --git a/topics/apimigration/protocol/framework/languages/jimple/syntax/Modifiers.sdf b/topics/api-migration/protocol/framework/languages/jimple/syntax/Modifiers.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/syntax/Modifiers.sdf
rename to topics/api-migration/protocol/framework/languages/jimple/syntax/Modifiers.sdf
diff --git a/topics/apimigration/protocol/framework/languages/jimple/syntax/Names.sdf b/topics/api-migration/protocol/framework/languages/jimple/syntax/Names.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/syntax/Names.sdf
rename to topics/api-migration/protocol/framework/languages/jimple/syntax/Names.sdf
diff --git a/topics/apimigration/protocol/framework/languages/jimple/syntax/Statements.sdf b/topics/api-migration/protocol/framework/languages/jimple/syntax/Statements.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/syntax/Statements.sdf
rename to topics/api-migration/protocol/framework/languages/jimple/syntax/Statements.sdf
diff --git a/topics/apimigration/protocol/framework/languages/jimple/syntax/Types.sdf b/topics/api-migration/protocol/framework/languages/jimple/syntax/Types.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/syntax/Types.sdf
rename to topics/api-migration/protocol/framework/languages/jimple/syntax/Types.sdf
diff --git a/topics/apimigration/protocol/framework/languages/jimple/syntax/Whitespace.sdf b/topics/api-migration/protocol/framework/languages/jimple/syntax/Whitespace.sdf
similarity index 100%
rename from topics/apimigration/protocol/framework/languages/jimple/syntax/Whitespace.sdf
rename to topics/api-migration/protocol/framework/languages/jimple/syntax/Whitespace.sdf
diff --git a/topics/apimigration/protocol/framework/migrate.sh b/topics/api-migration/protocol/framework/migrate.sh
similarity index 100%
rename from topics/apimigration/protocol/framework/migrate.sh
rename to topics/api-migration/protocol/framework/migrate.sh
diff --git a/topics/apimigration/protocol/framework/parse.sh b/topics/api-migration/protocol/framework/parse.sh
similarity index 100%
rename from topics/apimigration/protocol/framework/parse.sh
rename to topics/api-migration/protocol/framework/parse.sh
diff --git a/topics/apimigration/protocol/framework/soot.sh b/topics/api-migration/protocol/framework/soot.sh
similarity index 100%
rename from topics/apimigration/protocol/framework/soot.sh
rename to topics/api-migration/protocol/framework/soot.sh
diff --git a/topics/apimigration/protocol/framework/term2trace.sh b/topics/api-migration/protocol/framework/term2trace.sh
similarity index 100%
rename from topics/apimigration/protocol/framework/term2trace.sh
rename to topics/api-migration/protocol/framework/term2trace.sh
diff --git a/topics/apimigration/protocol/framework/terms/annotate-dom.trm b/topics/api-migration/protocol/framework/terms/annotate-dom.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/annotate-dom.trm
rename to topics/api-migration/protocol/framework/terms/annotate-dom.trm
diff --git a/topics/apimigration/protocol/framework/terms/annotate.trm b/topics/api-migration/protocol/framework/terms/annotate.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/annotate.trm
rename to topics/api-migration/protocol/framework/terms/annotate.trm
diff --git a/topics/apimigration/protocol/framework/terms/bitraces.trm b/topics/api-migration/protocol/framework/terms/bitraces.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/bitraces.trm
rename to topics/api-migration/protocol/framework/terms/bitraces.trm
diff --git a/topics/apimigration/protocol/framework/terms/bug.trm b/topics/api-migration/protocol/framework/terms/bug.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/bug.trm
rename to topics/api-migration/protocol/framework/terms/bug.trm
diff --git a/topics/apimigration/protocol/framework/terms/dom-accessing-jimple.trm b/topics/api-migration/protocol/framework/terms/dom-accessing-jimple.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/dom-accessing-jimple.trm
rename to topics/api-migration/protocol/framework/terms/dom-accessing-jimple.trm
diff --git a/topics/apimigration/protocol/framework/terms/dom-accessing-trace.trm b/topics/api-migration/protocol/framework/terms/dom-accessing-trace.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/dom-accessing-trace.trm
rename to topics/api-migration/protocol/framework/terms/dom-accessing-trace.trm
diff --git a/topics/apimigration/protocol/framework/terms/extract.trm b/topics/api-migration/protocol/framework/terms/extract.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/extract.trm
rename to topics/api-migration/protocol/framework/terms/extract.trm
diff --git a/topics/apimigration/protocol/framework/terms/jdom.trm b/topics/api-migration/protocol/framework/terms/jdom.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/jdom.trm
rename to topics/api-migration/protocol/framework/terms/jdom.trm
diff --git a/topics/apimigration/protocol/framework/terms/jdom2dom.trm b/topics/api-migration/protocol/framework/terms/jdom2dom.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/jdom2dom.trm
rename to topics/api-migration/protocol/framework/terms/jdom2dom.trm
diff --git a/topics/apimigration/protocol/framework/terms/jimple2term.trm b/topics/api-migration/protocol/framework/terms/jimple2term.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/jimple2term.trm
rename to topics/api-migration/protocol/framework/terms/jimple2term.trm
diff --git a/topics/apimigration/protocol/framework/terms/mapping.trm b/topics/api-migration/protocol/framework/terms/mapping.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/mapping.trm
rename to topics/api-migration/protocol/framework/terms/mapping.trm
diff --git a/topics/apimigration/protocol/framework/terms/match-subtrace.trm b/topics/api-migration/protocol/framework/terms/match-subtrace.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/match-subtrace.trm
rename to topics/api-migration/protocol/framework/terms/match-subtrace.trm
diff --git a/topics/apimigration/protocol/framework/terms/match.trm b/topics/api-migration/protocol/framework/terms/match.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/match.trm
rename to topics/api-migration/protocol/framework/terms/match.trm
diff --git a/topics/apimigration/protocol/framework/terms/migration.trm b/topics/api-migration/protocol/framework/terms/migration.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/migration.trm
rename to topics/api-migration/protocol/framework/terms/migration.trm
diff --git a/topics/apimigration/protocol/framework/terms/stats2trace-dom.trm b/topics/api-migration/protocol/framework/terms/stats2trace-dom.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/stats2trace-dom.trm
rename to topics/api-migration/protocol/framework/terms/stats2trace-dom.trm
diff --git a/topics/apimigration/protocol/framework/terms/stats2trace.trm b/topics/api-migration/protocol/framework/terms/stats2trace.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/stats2trace.trm
rename to topics/api-migration/protocol/framework/terms/stats2trace.trm
diff --git a/topics/apimigration/protocol/framework/terms/term2trace.trm b/topics/api-migration/protocol/framework/terms/term2trace.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/term2trace.trm
rename to topics/api-migration/protocol/framework/terms/term2trace.trm
diff --git a/topics/apimigration/protocol/framework/terms/toplevel.trm b/topics/api-migration/protocol/framework/terms/toplevel.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/toplevel.trm
rename to topics/api-migration/protocol/framework/terms/toplevel.trm
diff --git a/topics/apimigration/protocol/framework/terms/trace2term-jdom.trm b/topics/api-migration/protocol/framework/terms/trace2term-jdom.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/trace2term-jdom.trm
rename to topics/api-migration/protocol/framework/terms/trace2term-jdom.trm
diff --git a/topics/apimigration/protocol/framework/terms/trace2term.trm b/topics/api-migration/protocol/framework/terms/trace2term.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/trace2term.trm
rename to topics/api-migration/protocol/framework/terms/trace2term.trm
diff --git a/topics/apimigration/protocol/framework/terms/xo-dom-normalized.trm b/topics/api-migration/protocol/framework/terms/xo-dom-normalized.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/xo-dom-normalized.trm
rename to topics/api-migration/protocol/framework/terms/xo-dom-normalized.trm
diff --git a/topics/apimigration/protocol/framework/terms/xo-dom-tagged.trm b/topics/api-migration/protocol/framework/terms/xo-dom-tagged.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/xo-dom-tagged.trm
rename to topics/api-migration/protocol/framework/terms/xo-dom-tagged.trm
diff --git a/topics/apimigration/protocol/framework/terms/xo-jdom-sample.trm b/topics/api-migration/protocol/framework/terms/xo-jdom-sample.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/xo-jdom-sample.trm
rename to topics/api-migration/protocol/framework/terms/xo-jdom-sample.trm
diff --git a/topics/apimigration/protocol/framework/terms/xo-jdom-tagged.trm b/topics/api-migration/protocol/framework/terms/xo-jdom-tagged.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/xo-jdom-tagged.trm
rename to topics/api-migration/protocol/framework/terms/xo-jdom-tagged.trm
diff --git a/topics/apimigration/protocol/framework/terms/xo-jdom-trace.trm b/topics/api-migration/protocol/framework/terms/xo-jdom-trace.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/xo-jdom-trace.trm
rename to topics/api-migration/protocol/framework/terms/xo-jdom-trace.trm
diff --git a/topics/apimigration/protocol/framework/terms/xo-jdom.trm b/topics/api-migration/protocol/framework/terms/xo-jdom.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/xo-jdom.trm
rename to topics/api-migration/protocol/framework/terms/xo-jdom.trm
diff --git a/topics/apimigration/protocol/framework/terms/zip.trm b/topics/api-migration/protocol/framework/terms/zip.trm
similarity index 100%
rename from topics/apimigration/protocol/framework/terms/zip.trm
rename to topics/api-migration/protocol/framework/terms/zip.trm
diff --git a/topics/apimigration/protocol/framework/trace.sh b/topics/api-migration/protocol/framework/trace.sh
similarity index 100%
rename from topics/apimigration/protocol/framework/trace.sh
rename to topics/api-migration/protocol/framework/trace.sh
diff --git a/topics/apimigration/protocol/framework/trace2term.eqs b/topics/api-migration/protocol/framework/trace2term.eqs
similarity index 100%
rename from topics/apimigration/protocol/framework/trace2term.eqs
rename to topics/api-migration/protocol/framework/trace2term.eqs
diff --git a/topics/apimigration/protocol/framework/trace2term.trm.tbl b/topics/api-migration/protocol/framework/trace2term.trm.tbl
similarity index 100%
rename from topics/apimigration/protocol/framework/trace2term.trm.tbl
rename to topics/api-migration/protocol/framework/trace2term.trm.tbl
diff --git a/topics/apimigration/protocol/framework/tracing.eqs b/topics/api-migration/protocol/framework/tracing.eqs
similarity index 100%
rename from topics/apimigration/protocol/framework/tracing.eqs
rename to topics/api-migration/protocol/framework/tracing.eqs
diff --git a/topics/apimigration/protocol/framework/tracing.pro b/topics/api-migration/protocol/framework/tracing.pro
similarity index 100%
rename from topics/apimigration/protocol/framework/tracing.pro
rename to topics/api-migration/protocol/framework/tracing.pro
diff --git a/topics/apimigration/protocol/framework/tracing.trm.tbl b/topics/api-migration/protocol/framework/tracing.trm.tbl
similarity index 100%
rename from topics/apimigration/protocol/framework/tracing.trm.tbl
rename to topics/api-migration/protocol/framework/tracing.trm.tbl
diff --git a/topics/apimigration/protocol/framework/ziptrace.eqs b/topics/api-migration/protocol/framework/ziptrace.eqs
similarity index 100%
rename from topics/apimigration/protocol/framework/ziptrace.eqs
rename to topics/api-migration/protocol/framework/ziptrace.eqs
diff --git a/topics/apimigration/protocol/framework/ziptrace.trm.tbl b/topics/api-migration/protocol/framework/ziptrace.trm.tbl
similarity index 100%
rename from topics/apimigration/protocol/framework/ziptrace.trm.tbl
rename to topics/api-migration/protocol/framework/ziptrace.trm.tbl
diff --git a/topics/apimigration/protocol/samples/Makefile b/topics/api-migration/protocol/samples/Makefile
similarity index 100%
rename from topics/apimigration/protocol/samples/Makefile
rename to topics/api-migration/protocol/samples/Makefile
diff --git a/topics/apimigration/protocol/samples/dom.grammar b/topics/api-migration/protocol/samples/dom.grammar
similarity index 100%
rename from topics/apimigration/protocol/samples/dom.grammar
rename to topics/api-migration/protocol/samples/dom.grammar
diff --git a/topics/apimigration/protocol/samples/dom.jimple b/topics/api-migration/protocol/samples/dom.jimple
similarity index 100%
rename from topics/apimigration/protocol/samples/dom.jimple
rename to topics/api-migration/protocol/samples/dom.jimple
diff --git a/topics/apimigration/protocol/samples/dom.parsed b/topics/api-migration/protocol/samples/dom.parsed
similarity index 100%
rename from topics/apimigration/protocol/samples/dom.parsed
rename to topics/api-migration/protocol/samples/dom.parsed
diff --git a/topics/apimigration/protocol/samples/dom.patterns b/topics/api-migration/protocol/samples/dom.patterns
similarity index 100%
rename from topics/apimigration/protocol/samples/dom.patterns
rename to topics/api-migration/protocol/samples/dom.patterns
diff --git a/topics/apimigration/protocol/samples/dom.trace b/topics/api-migration/protocol/samples/dom.trace
similarity index 100%
rename from topics/apimigration/protocol/samples/dom.trace
rename to topics/api-migration/protocol/samples/dom.trace
diff --git a/topics/apimigration/protocol/samples/jdom.annot b/topics/api-migration/protocol/samples/jdom.annot
similarity index 100%
rename from topics/apimigration/protocol/samples/jdom.annot
rename to topics/api-migration/protocol/samples/jdom.annot
diff --git a/topics/apimigration/protocol/samples/jdom.grammar b/topics/api-migration/protocol/samples/jdom.grammar
similarity index 100%
rename from topics/apimigration/protocol/samples/jdom.grammar
rename to topics/api-migration/protocol/samples/jdom.grammar
diff --git a/topics/apimigration/protocol/samples/jdom.jimple b/topics/api-migration/protocol/samples/jdom.jimple
similarity index 100%
rename from topics/apimigration/protocol/samples/jdom.jimple
rename to topics/api-migration/protocol/samples/jdom.jimple
diff --git a/topics/apimigration/protocol/samples/jdom.mapped b/topics/api-migration/protocol/samples/jdom.mapped
similarity index 100%
rename from topics/apimigration/protocol/samples/jdom.mapped
rename to topics/api-migration/protocol/samples/jdom.mapped
diff --git a/topics/apimigration/protocol/samples/jdom.mapping b/topics/api-migration/protocol/samples/jdom.mapping
similarity index 100%
rename from topics/apimigration/protocol/samples/jdom.mapping
rename to topics/api-migration/protocol/samples/jdom.mapping
diff --git a/topics/apimigration/protocol/samples/jdom.parsed b/topics/api-migration/protocol/samples/jdom.parsed
similarity index 100%
rename from topics/apimigration/protocol/samples/jdom.parsed
rename to topics/api-migration/protocol/samples/jdom.parsed
diff --git a/topics/apimigration/protocol/samples/jdom.patterns b/topics/api-migration/protocol/samples/jdom.patterns
similarity index 100%
rename from topics/apimigration/protocol/samples/jdom.patterns
rename to topics/api-migration/protocol/samples/jdom.patterns
diff --git a/topics/apimigration/protocol/samples/jdom.trace b/topics/api-migration/protocol/samples/jdom.trace
similarity index 100%
rename from topics/apimigration/protocol/samples/jdom.trace
rename to topics/api-migration/protocol/samples/jdom.trace
diff --git a/topics/apimigration/protocol/samples/xo-jdom2dom-mapped.sh b/topics/api-migration/protocol/samples/xo-jdom2dom-mapped.sh
similarity index 100%
rename from topics/apimigration/protocol/samples/xo-jdom2dom-mapped.sh
rename to topics/api-migration/protocol/samples/xo-jdom2dom-mapped.sh
diff --git a/topics/apimigration/protocol/samples/xo-jdom2dom.pro b/topics/api-migration/protocol/samples/xo-jdom2dom.pro
similarity index 100%
rename from topics/apimigration/protocol/samples/xo-jdom2dom.pro
rename to topics/api-migration/protocol/samples/xo-jdom2dom.pro
diff --git a/topics/apimigration/protocol/samples/xo-jdom2dom.sh b/topics/api-migration/protocol/samples/xo-jdom2dom.sh
similarity index 100%
rename from topics/apimigration/protocol/samples/xo-jdom2dom.sh
rename to topics/api-migration/protocol/samples/xo-jdom2dom.sh
diff --git a/topics/apimigration/rewriting/JDom2Dom.asf b/topics/api-migration/rewriting/JDom2Dom.asf
similarity index 100%
rename from topics/apimigration/rewriting/JDom2Dom.asf
rename to topics/api-migration/rewriting/JDom2Dom.asf
diff --git a/topics/apimigration/rewriting/JDom2Dom.sdf b/topics/api-migration/rewriting/JDom2Dom.sdf
similarity index 100%
rename from topics/apimigration/rewriting/JDom2Dom.sdf
rename to topics/api-migration/rewriting/JDom2Dom.sdf
diff --git a/topics/apimigration/rewriting/Java-15.sdf b/topics/api-migration/rewriting/Java-15.sdf
similarity index 100%
rename from topics/apimigration/rewriting/Java-15.sdf
rename to topics/api-migration/rewriting/Java-15.sdf
diff --git a/topics/apimigration/rewriting/JavaCompilationUnit-15.sdf b/topics/api-migration/rewriting/JavaCompilationUnit-15.sdf
similarity index 100%
rename from topics/apimigration/rewriting/JavaCompilationUnit-15.sdf
rename to topics/api-migration/rewriting/JavaCompilationUnit-15.sdf
diff --git a/topics/apimigration/rewriting/jdom2dom.trm b/topics/api-migration/rewriting/jdom2dom.trm
similarity index 100%
rename from topics/apimigration/rewriting/jdom2dom.trm
rename to topics/api-migration/rewriting/jdom2dom.trm
diff --git a/topics/apimigration/rewriting/languages/java-15/Main.sdf b/topics/api-migration/rewriting/languages/java-15/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/arrays/ArrayInitializers.sdf b/topics/api-migration/rewriting/languages/java-15/arrays/ArrayInitializers.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/arrays/ArrayInitializers.sdf
rename to topics/api-migration/rewriting/languages/java-15/arrays/ArrayInitializers.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/arrays/Main.sdf b/topics/api-migration/rewriting/languages/java-15/arrays/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/arrays/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/arrays/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/classes/ClassDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/classes/ClassDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/classes/ClassDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/classes/ClassDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/classes/ConstructorDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/classes/ConstructorDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/classes/ConstructorDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/classes/ConstructorDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/classes/EnumDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/classes/EnumDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/classes/EnumDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/classes/EnumDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/classes/FieldDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/classes/FieldDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/classes/FieldDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/classes/FieldDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/classes/InstanceInitializers.sdf b/topics/api-migration/rewriting/languages/java-15/classes/InstanceInitializers.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/classes/InstanceInitializers.sdf
rename to topics/api-migration/rewriting/languages/java-15/classes/InstanceInitializers.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/classes/Main.sdf b/topics/api-migration/rewriting/languages/java-15/classes/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/classes/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/classes/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/classes/MethodDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/classes/MethodDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/classes/MethodDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/classes/MethodDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/classes/StaticInitializers.sdf b/topics/api-migration/rewriting/languages/java-15/classes/StaticInitializers.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/classes/StaticInitializers.sdf
rename to topics/api-migration/rewriting/languages/java-15/classes/StaticInitializers.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/ArrayAccess.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/ArrayAccess.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/ArrayAccess.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/ArrayAccess.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/ArrayCreation.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/ArrayCreation.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/ArrayCreation.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/ArrayCreation.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/AssignmentOperators.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/AssignmentOperators.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/AssignmentOperators.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/AssignmentOperators.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/BinaryOperators.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/BinaryOperators.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/BinaryOperators.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/BinaryOperators.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/ClassInstanceCreation.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/ClassInstanceCreation.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/ClassInstanceCreation.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/ClassInstanceCreation.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/FieldAccess.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/FieldAccess.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/FieldAccess.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/FieldAccess.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/Main.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/MethodInvocation.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/MethodInvocation.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/MethodInvocation.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/MethodInvocation.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/Postfix.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/Postfix.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/Postfix.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/Postfix.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/Primary.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/Primary.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/Primary.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/Primary.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/Priorities.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/Priorities.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/Priorities.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/Priorities.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/Restrictions.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/Restrictions.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/Restrictions.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/Restrictions.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/expressions/UnaryOperators.sdf b/topics/api-migration/rewriting/languages/java-15/expressions/UnaryOperators.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/expressions/UnaryOperators.sdf
rename to topics/api-migration/rewriting/languages/java-15/expressions/UnaryOperators.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/interfaces/AbstractMethodDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/interfaces/AbstractMethodDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/interfaces/AbstractMethodDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/interfaces/AbstractMethodDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/interfaces/AnnotationTypes.sdf b/topics/api-migration/rewriting/languages/java-15/interfaces/AnnotationTypes.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/interfaces/AnnotationTypes.sdf
rename to topics/api-migration/rewriting/languages/java-15/interfaces/AnnotationTypes.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/interfaces/Annotations.sdf b/topics/api-migration/rewriting/languages/java-15/interfaces/Annotations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/interfaces/Annotations.sdf
rename to topics/api-migration/rewriting/languages/java-15/interfaces/Annotations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/interfaces/ConstantDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/interfaces/ConstantDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/interfaces/ConstantDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/interfaces/ConstantDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/interfaces/InterfaceDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/interfaces/InterfaceDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/interfaces/InterfaceDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/interfaces/InterfaceDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/interfaces/Main.sdf b/topics/api-migration/rewriting/languages/java-15/interfaces/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/interfaces/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/interfaces/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/Comments.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/Comments.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/Comments.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/Comments.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/Identifiers.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/Identifiers.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/Identifiers.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/Identifiers.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/Keywords.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/Keywords.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/Keywords.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/Keywords.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/LineTerminators.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/LineTerminators.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/LineTerminators.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/LineTerminators.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/Main.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/Modifiers.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/Modifiers.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/Modifiers.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/Modifiers.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/UnicodeEscapes.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/UnicodeEscapes.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/UnicodeEscapes.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/UnicodeEscapes.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/WhiteSpace.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/WhiteSpace.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/WhiteSpace.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/WhiteSpace.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/literals/BooleanLiterals.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/literals/BooleanLiterals.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/literals/BooleanLiterals.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/literals/BooleanLiterals.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/literals/CharacterLiterals.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/literals/CharacterLiterals.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/literals/CharacterLiterals.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/literals/CharacterLiterals.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/literals/EscapeSequences.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/literals/EscapeSequences.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/literals/EscapeSequences.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/literals/EscapeSequences.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/literals/FloatingPointLiterals.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/literals/FloatingPointLiterals.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/literals/FloatingPointLiterals.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/literals/FloatingPointLiterals.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/literals/IntegerLiterals.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/literals/IntegerLiterals.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/literals/IntegerLiterals.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/literals/IntegerLiterals.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/literals/Main.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/literals/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/literals/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/literals/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/literals/NullLiteral.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/literals/NullLiteral.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/literals/NullLiteral.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/literals/NullLiteral.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/lexical/literals/StringLiterals.sdf b/topics/api-migration/rewriting/languages/java-15/lexical/literals/StringLiterals.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/lexical/literals/StringLiterals.sdf
rename to topics/api-migration/rewriting/languages/java-15/lexical/literals/StringLiterals.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/names/Main.sdf b/topics/api-migration/rewriting/languages/java-15/names/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/names/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/names/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/packages/CompilationUnits.sdf b/topics/api-migration/rewriting/languages/java-15/packages/CompilationUnits.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/packages/CompilationUnits.sdf
rename to topics/api-migration/rewriting/languages/java-15/packages/CompilationUnits.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/packages/ImportDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/packages/ImportDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/packages/ImportDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/packages/ImportDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/packages/Main.sdf b/topics/api-migration/rewriting/languages/java-15/packages/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/packages/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/packages/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/packages/PackageDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/packages/PackageDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/packages/PackageDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/packages/PackageDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/packages/TypeDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/packages/TypeDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/packages/TypeDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/packages/TypeDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/statements/Blocks.sdf b/topics/api-migration/rewriting/languages/java-15/statements/Blocks.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/statements/Blocks.sdf
rename to topics/api-migration/rewriting/languages/java-15/statements/Blocks.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/statements/LocalVariableDeclarations.sdf b/topics/api-migration/rewriting/languages/java-15/statements/LocalVariableDeclarations.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/statements/LocalVariableDeclarations.sdf
rename to topics/api-migration/rewriting/languages/java-15/statements/LocalVariableDeclarations.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/statements/Main.sdf b/topics/api-migration/rewriting/languages/java-15/statements/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/statements/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/statements/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/statements/Statements.sdf b/topics/api-migration/rewriting/languages/java-15/statements/Statements.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/statements/Statements.sdf
rename to topics/api-migration/rewriting/languages/java-15/statements/Statements.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/types/Main.sdf b/topics/api-migration/rewriting/languages/java-15/types/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/types/Main.sdf
rename to topics/api-migration/rewriting/languages/java-15/types/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/types/ParameterizedTypes.sdf b/topics/api-migration/rewriting/languages/java-15/types/ParameterizedTypes.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/types/ParameterizedTypes.sdf
rename to topics/api-migration/rewriting/languages/java-15/types/ParameterizedTypes.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/types/PrimitiveTypes.sdf b/topics/api-migration/rewriting/languages/java-15/types/PrimitiveTypes.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/types/PrimitiveTypes.sdf
rename to topics/api-migration/rewriting/languages/java-15/types/PrimitiveTypes.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/types/ReferenceTypes.sdf b/topics/api-migration/rewriting/languages/java-15/types/ReferenceTypes.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/types/ReferenceTypes.sdf
rename to topics/api-migration/rewriting/languages/java-15/types/ReferenceTypes.sdf
diff --git a/topics/apimigration/rewriting/languages/java-15/types/TypeVariables.sdf b/topics/api-migration/rewriting/languages/java-15/types/TypeVariables.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/java-15/types/TypeVariables.sdf
rename to topics/api-migration/rewriting/languages/java-15/types/TypeVariables.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/extract/Extract-Dataflow.asf b/topics/api-migration/rewriting/languages/jimple/extract/Extract-Dataflow.asf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/extract/Extract-Dataflow.asf
rename to topics/api-migration/rewriting/languages/jimple/extract/Extract-Dataflow.asf
diff --git a/topics/apimigration/rewriting/languages/jimple/extract/Extract-Dataflow.sdf b/topics/api-migration/rewriting/languages/jimple/extract/Extract-Dataflow.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/extract/Extract-Dataflow.sdf
rename to topics/api-migration/rewriting/languages/jimple/extract/Extract-Dataflow.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/syntax/Expressions.sdf b/topics/api-migration/rewriting/languages/jimple/syntax/Expressions.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/syntax/Expressions.sdf
rename to topics/api-migration/rewriting/languages/jimple/syntax/Expressions.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/syntax/Jimple.sdf b/topics/api-migration/rewriting/languages/jimple/syntax/Jimple.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/syntax/Jimple.sdf
rename to topics/api-migration/rewriting/languages/jimple/syntax/Jimple.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/syntax/Keywords.sdf b/topics/api-migration/rewriting/languages/jimple/syntax/Keywords.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/syntax/Keywords.sdf
rename to topics/api-migration/rewriting/languages/jimple/syntax/Keywords.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/syntax/Lexical.sdf b/topics/api-migration/rewriting/languages/jimple/syntax/Lexical.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/syntax/Lexical.sdf
rename to topics/api-migration/rewriting/languages/jimple/syntax/Lexical.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/syntax/Main.sdf b/topics/api-migration/rewriting/languages/jimple/syntax/Main.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/syntax/Main.sdf
rename to topics/api-migration/rewriting/languages/jimple/syntax/Main.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/syntax/Modifiers.sdf b/topics/api-migration/rewriting/languages/jimple/syntax/Modifiers.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/syntax/Modifiers.sdf
rename to topics/api-migration/rewriting/languages/jimple/syntax/Modifiers.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/syntax/Names.sdf b/topics/api-migration/rewriting/languages/jimple/syntax/Names.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/syntax/Names.sdf
rename to topics/api-migration/rewriting/languages/jimple/syntax/Names.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/syntax/Statements.sdf b/topics/api-migration/rewriting/languages/jimple/syntax/Statements.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/syntax/Statements.sdf
rename to topics/api-migration/rewriting/languages/jimple/syntax/Statements.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/syntax/Types.sdf b/topics/api-migration/rewriting/languages/jimple/syntax/Types.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/syntax/Types.sdf
rename to topics/api-migration/rewriting/languages/jimple/syntax/Types.sdf
diff --git a/topics/apimigration/rewriting/languages/jimple/syntax/Whitespace.sdf b/topics/api-migration/rewriting/languages/jimple/syntax/Whitespace.sdf
similarity index 100%
rename from topics/apimigration/rewriting/languages/jimple/syntax/Whitespace.sdf
rename to topics/api-migration/rewriting/languages/jimple/syntax/Whitespace.sdf
diff --git a/topics/exercises/ccs/Makefile b/topics/exercises/ccs/Makefile
deleted file mode 100644
index ca0acf8a..00000000
--- a/topics/exercises/ccs/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-test:
-	echo "README: type system(As) and see what happens."
-	swipl -s JobShop.pro
-
-clean:
-	rm -rf *~
diff --git a/topics/exercises/hutton/Parsing.lhs b/topics/implementation/Hutton/Parsing.lhs
similarity index 100%
rename from topics/exercises/hutton/Parsing.lhs
rename to topics/implementation/Hutton/Parsing.lhs
diff --git a/topics/exercises/hutton/README.txt b/topics/implementation/Hutton/README.txt
similarity index 100%
rename from topics/exercises/hutton/README.txt
rename to topics/implementation/Hutton/README.txt
diff --git a/topics/exercises/hutton/calculator.lhs b/topics/implementation/Hutton/calculator.lhs
similarity index 100%
rename from topics/exercises/hutton/calculator.lhs
rename to topics/implementation/Hutton/calculator.lhs
diff --git a/topics/exercises/hutton/cipher.lhs b/topics/implementation/Hutton/cipher.lhs
similarity index 100%
rename from topics/exercises/hutton/cipher.lhs
rename to topics/implementation/Hutton/cipher.lhs
diff --git a/topics/exercises/hutton/compiler.lhs b/topics/implementation/Hutton/compiler.lhs
similarity index 100%
rename from topics/exercises/hutton/compiler.lhs
rename to topics/implementation/Hutton/compiler.lhs
diff --git a/topics/exercises/hutton/countdown.lhs b/topics/implementation/Hutton/countdown.lhs
similarity index 100%
rename from topics/exercises/hutton/countdown.lhs
rename to topics/implementation/Hutton/countdown.lhs
diff --git a/topics/exercises/hutton/life.lhs b/topics/implementation/Hutton/life.lhs
similarity index 100%
rename from topics/exercises/hutton/life.lhs
rename to topics/implementation/Hutton/life.lhs
diff --git a/topics/exercises/hutton/machine.lhs b/topics/implementation/Hutton/machine.lhs
similarity index 100%
rename from topics/exercises/hutton/machine.lhs
rename to topics/implementation/Hutton/machine.lhs
diff --git a/topics/exercises/hutton/parser.lhs b/topics/implementation/Hutton/parser.lhs
similarity index 100%
rename from topics/exercises/hutton/parser.lhs
rename to topics/implementation/Hutton/parser.lhs
diff --git a/topics/exercises/hutton/tautology.lhs b/topics/implementation/Hutton/tautology.lhs
similarity index 100%
rename from topics/exercises/hutton/tautology.lhs
rename to topics/implementation/Hutton/tautology.lhs
diff --git a/topics/exercises/hutton/transmit.lhs b/topics/implementation/Hutton/transmit.lhs
similarity index 100%
rename from topics/exercises/hutton/transmit.lhs
rename to topics/implementation/Hutton/transmit.lhs
diff --git a/topics/NielsonN07/ChangeLog b/topics/implementation/NielsonN07/ChangeLog
similarity index 100%
rename from topics/NielsonN07/ChangeLog
rename to topics/implementation/NielsonN07/ChangeLog
diff --git a/topics/NielsonN07/Haskell/Makefile b/topics/implementation/NielsonN07/Haskell/Makefile
similarity index 100%
rename from topics/NielsonN07/Haskell/Makefile
rename to topics/implementation/NielsonN07/Haskell/Makefile
diff --git a/topics/NielsonN07/Haskell/include/Main.in b/topics/implementation/NielsonN07/Haskell/include/Main.in
similarity index 100%
rename from topics/NielsonN07/Haskell/include/Main.in
rename to topics/implementation/NielsonN07/Haskell/include/Main.in
diff --git a/topics/NielsonN07/Haskell/include/Makefile.include b/topics/implementation/NielsonN07/Haskell/include/Makefile.include
similarity index 100%
rename from topics/NielsonN07/Haskell/include/Makefile.include
rename to topics/implementation/NielsonN07/Haskell/include/Makefile.include
diff --git a/topics/NielsonN07/Haskell/src/Makefile b/topics/implementation/NielsonN07/Haskell/src/Makefile
similarity index 100%
rename from topics/NielsonN07/Haskell/src/Makefile
rename to topics/implementation/NielsonN07/Haskell/src/Makefile
diff --git a/topics/NielsonN07/Haskell/src/SemanticsLib/Boolean.hs b/topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Boolean.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/SemanticsLib/Boolean.hs
rename to topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Boolean.hs
diff --git a/topics/NielsonN07/Haskell/src/SemanticsLib/Domain.hs b/topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Domain.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/SemanticsLib/Domain.hs
rename to topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Domain.hs
diff --git a/topics/NielsonN07/Haskell/src/SemanticsLib/Fix.hs b/topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Fix.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/SemanticsLib/Fix.hs
rename to topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Fix.hs
diff --git a/topics/NielsonN07/Haskell/src/SemanticsLib/Main.hs b/topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Main.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/SemanticsLib/Main.hs
rename to topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Main.hs
diff --git a/topics/NielsonN07/Haskell/src/SemanticsLib/Map.hs b/topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Map.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/SemanticsLib/Map.hs
rename to topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Map.hs
diff --git a/topics/NielsonN07/Haskell/src/SemanticsLib/Number.hs b/topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Number.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/SemanticsLib/Number.hs
rename to topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Number.hs
diff --git a/topics/NielsonN07/Haskell/src/SemanticsLib/Sign.hs b/topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Sign.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/SemanticsLib/Sign.hs
rename to topics/implementation/NielsonN07/Haskell/src/SemanticsLib/Sign.hs
diff --git a/topics/NielsonN07/Haskell/src/SemanticsLib/State.hs b/topics/implementation/NielsonN07/Haskell/src/SemanticsLib/State.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/SemanticsLib/State.hs
rename to topics/implementation/NielsonN07/Haskell/src/SemanticsLib/State.hs
diff --git a/topics/NielsonN07/Haskell/src/SemanticsLib/TT.hs b/topics/implementation/NielsonN07/Haskell/src/SemanticsLib/TT.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/SemanticsLib/TT.hs
rename to topics/implementation/NielsonN07/Haskell/src/SemanticsLib/TT.hs
diff --git a/topics/NielsonN07/Haskell/src/While/AbstractSyntax.hs b/topics/implementation/NielsonN07/Haskell/src/While/AbstractSyntax.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/AbstractSyntax.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/AbstractSyntax.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/ContinuationStyle.hs b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/ContinuationStyle.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/ContinuationStyle.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/ContinuationStyle.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/DirectStyle.hs b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/DirectStyle.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/DirectStyle.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/DirectStyle.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/DirectStyleMaybe.hs b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/DirectStyleMaybe.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/DirectStyleMaybe.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/DirectStyleMaybe.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main0.hs b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main0.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main0.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main0.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main0.ref b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main0.ref
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main0.ref
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main0.ref
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main1.hs b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main1.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main1.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main1.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main1.ref b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main1.ref
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main1.ref
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main1.ref
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main2.hs b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main2.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main2.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main2.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main2.ref b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main2.ref
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main2.ref
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main2.ref
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main3.hs b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main3.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main3.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main3.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main3.ref b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main3.ref
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main3.ref
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main3.ref
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main4.hs b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main4.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main4.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main4.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main4.ref b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main4.ref
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Main4.ref
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Main4.ref
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Makefile b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Makefile
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/Makefile
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/Makefile
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleDirectStyle.hs b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleDirectStyle.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleDirectStyle.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleDirectStyle.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleMain0.hs b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleMain0.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleMain0.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleMain0.hs
diff --git a/topics/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleMain0.ref b/topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleMain0.ref
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleMain0.ref
rename to topics/implementation/NielsonN07/Haskell/src/While/DenotationalSemantics/SimpleMain0.ref
diff --git a/topics/NielsonN07/Haskell/src/While/Fold.hs b/topics/implementation/NielsonN07/Haskell/src/While/Fold.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/Fold.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/Fold.hs
diff --git a/topics/NielsonN07/Haskell/src/While/Makefile b/topics/implementation/NielsonN07/Haskell/src/While/Makefile
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/Makefile
rename to topics/implementation/NielsonN07/Haskell/src/While/Makefile
diff --git a/topics/NielsonN07/Haskell/src/While/SignDetection/Main0.hs b/topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main0.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/SignDetection/Main0.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main0.hs
diff --git a/topics/NielsonN07/Haskell/src/While/SignDetection/Main0.ref b/topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main0.ref
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/SignDetection/Main0.ref
rename to topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main0.ref
diff --git a/topics/NielsonN07/Haskell/src/While/SignDetection/Main1.hs b/topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main1.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/SignDetection/Main1.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main1.hs
diff --git a/topics/NielsonN07/Haskell/src/While/SignDetection/Main1.ref b/topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main1.ref
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/SignDetection/Main1.ref
rename to topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main1.ref
diff --git a/topics/NielsonN07/Haskell/src/While/SignDetection/Main2.hs b/topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main2.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/SignDetection/Main2.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main2.hs
diff --git a/topics/NielsonN07/Haskell/src/While/SignDetection/Main2.ref b/topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main2.ref
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/SignDetection/Main2.ref
rename to topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Main2.ref
diff --git a/topics/NielsonN07/Haskell/src/While/SignDetection/Makefile b/topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Makefile
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/SignDetection/Makefile
rename to topics/implementation/NielsonN07/Haskell/src/While/SignDetection/Makefile
diff --git a/topics/NielsonN07/Haskell/src/While/SimpleAbstractSyntax.hs b/topics/implementation/NielsonN07/Haskell/src/While/SimpleAbstractSyntax.hs
similarity index 100%
rename from topics/NielsonN07/Haskell/src/While/SimpleAbstractSyntax.hs
rename to topics/implementation/NielsonN07/Haskell/src/While/SimpleAbstractSyntax.hs
diff --git a/topics/NielsonN07/LICENSE b/topics/implementation/NielsonN07/LICENSE
similarity index 100%
rename from topics/NielsonN07/LICENSE
rename to topics/implementation/NielsonN07/LICENSE
diff --git a/topics/NielsonN07/Makefile b/topics/implementation/NielsonN07/Makefile
similarity index 100%
rename from topics/NielsonN07/Makefile
rename to topics/implementation/NielsonN07/Makefile
diff --git a/topics/NielsonN07/Prolog/While/DCG/Makefile b/topics/implementation/NielsonN07/Prolog/While/DCG/Makefile
similarity index 100%
rename from topics/NielsonN07/Prolog/While/DCG/Makefile
rename to topics/implementation/NielsonN07/Prolog/While/DCG/Makefile
diff --git a/topics/NielsonN07/Prolog/While/DCG/input.txt b/topics/implementation/NielsonN07/Prolog/While/DCG/input.txt
similarity index 100%
rename from topics/NielsonN07/Prolog/While/DCG/input.txt
rename to topics/implementation/NielsonN07/Prolog/While/DCG/input.txt
diff --git a/topics/NielsonN07/Prolog/While/DCG/main.pro b/topics/implementation/NielsonN07/Prolog/While/DCG/main.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/DCG/main.pro
rename to topics/implementation/NielsonN07/Prolog/While/DCG/main.pro
diff --git a/topics/NielsonN07/Prolog/While/DCG/parselib.pro b/topics/implementation/NielsonN07/Prolog/While/DCG/parselib.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/DCG/parselib.pro
rename to topics/implementation/NielsonN07/Prolog/While/DCG/parselib.pro
diff --git a/topics/NielsonN07/Prolog/While/DCG/parser.pro b/topics/implementation/NielsonN07/Prolog/While/DCG/parser.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/DCG/parser.pro
rename to topics/implementation/NielsonN07/Prolog/While/DCG/parser.pro
diff --git a/topics/NielsonN07/Prolog/While/NS/Makefile b/topics/implementation/NielsonN07/Prolog/While/NS/Makefile
similarity index 100%
rename from topics/NielsonN07/Prolog/While/NS/Makefile
rename to topics/implementation/NielsonN07/Prolog/While/NS/Makefile
diff --git a/topics/NielsonN07/Prolog/While/NS/README b/topics/implementation/NielsonN07/Prolog/While/NS/README
similarity index 100%
rename from topics/NielsonN07/Prolog/While/NS/README
rename to topics/implementation/NielsonN07/Prolog/While/NS/README
diff --git a/topics/NielsonN07/Prolog/While/NS/eval.pro b/topics/implementation/NielsonN07/Prolog/While/NS/eval.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/NS/eval.pro
rename to topics/implementation/NielsonN07/Prolog/While/NS/eval.pro
diff --git a/topics/NielsonN07/Prolog/While/NS/exec.pro b/topics/implementation/NielsonN07/Prolog/While/NS/exec.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/NS/exec.pro
rename to topics/implementation/NielsonN07/Prolog/While/NS/exec.pro
diff --git a/topics/NielsonN07/Prolog/While/NS/main.pro b/topics/implementation/NielsonN07/Prolog/While/NS/main.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/NS/main.pro
rename to topics/implementation/NielsonN07/Prolog/While/NS/main.pro
diff --git a/topics/NielsonN07/Prolog/While/NS/map.pro b/topics/implementation/NielsonN07/Prolog/While/NS/map.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/NS/map.pro
rename to topics/implementation/NielsonN07/Prolog/While/NS/map.pro
diff --git a/topics/NielsonN07/Prolog/While/NS/test.pro b/topics/implementation/NielsonN07/Prolog/While/NS/test.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/NS/test.pro
rename to topics/implementation/NielsonN07/Prolog/While/NS/test.pro
diff --git a/topics/NielsonN07/Prolog/While/SOS/Makefile b/topics/implementation/NielsonN07/Prolog/While/SOS/Makefile
similarity index 100%
rename from topics/NielsonN07/Prolog/While/SOS/Makefile
rename to topics/implementation/NielsonN07/Prolog/While/SOS/Makefile
diff --git a/topics/NielsonN07/Prolog/While/SOS/README b/topics/implementation/NielsonN07/Prolog/While/SOS/README
similarity index 100%
rename from topics/NielsonN07/Prolog/While/SOS/README
rename to topics/implementation/NielsonN07/Prolog/While/SOS/README
diff --git a/topics/NielsonN07/Prolog/While/SOS/eval.pro b/topics/implementation/NielsonN07/Prolog/While/SOS/eval.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/SOS/eval.pro
rename to topics/implementation/NielsonN07/Prolog/While/SOS/eval.pro
diff --git a/topics/NielsonN07/Prolog/While/SOS/exec.pro b/topics/implementation/NielsonN07/Prolog/While/SOS/exec.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/SOS/exec.pro
rename to topics/implementation/NielsonN07/Prolog/While/SOS/exec.pro
diff --git a/topics/NielsonN07/Prolog/While/SOS/main.pro b/topics/implementation/NielsonN07/Prolog/While/SOS/main.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/SOS/main.pro
rename to topics/implementation/NielsonN07/Prolog/While/SOS/main.pro
diff --git a/topics/NielsonN07/Prolog/While/SOS/map.pro b/topics/implementation/NielsonN07/Prolog/While/SOS/map.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/SOS/map.pro
rename to topics/implementation/NielsonN07/Prolog/While/SOS/map.pro
diff --git a/topics/NielsonN07/Prolog/While/SOS/test.pro b/topics/implementation/NielsonN07/Prolog/While/SOS/test.pro
similarity index 100%
rename from topics/NielsonN07/Prolog/While/SOS/test.pro
rename to topics/implementation/NielsonN07/Prolog/While/SOS/test.pro
diff --git a/topics/NielsonN07/README b/topics/implementation/NielsonN07/README
similarity index 100%
rename from topics/NielsonN07/README
rename to topics/implementation/NielsonN07/README
diff --git a/topics/exercises/README.txt b/topics/implementation/README.txt
similarity index 100%
rename from topics/exercises/README.txt
rename to topics/implementation/README.txt
diff --git a/topics/exercises/b2/B.hs b/topics/implementation/b/folding/B.hs
similarity index 100%
rename from topics/exercises/b2/B.hs
rename to topics/implementation/b/folding/B.hs
diff --git a/topics/exercises/b3/Makefile b/topics/implementation/b/folding/Makefile
similarity index 100%
rename from topics/exercises/b3/Makefile
rename to topics/implementation/b/folding/Makefile
diff --git a/topics/exercises/b3/foldB.hs b/topics/implementation/b/folding/foldB.hs
similarity index 100%
rename from topics/exercises/b3/foldB.hs
rename to topics/implementation/b/folding/foldB.hs
diff --git a/topics/exercises/b3/B.hs b/topics/implementation/b/parsing/B.hs
similarity index 100%
rename from topics/exercises/b3/B.hs
rename to topics/implementation/b/parsing/B.hs
diff --git a/topics/exercises/b2/Makefile b/topics/implementation/b/parsing/Makefile
similarity index 100%
rename from topics/exercises/b2/Makefile
rename to topics/implementation/b/parsing/Makefile
diff --git a/topics/exercises/b2/parseB.hs b/topics/implementation/b/parsing/parseB.hs
similarity index 100%
rename from topics/exercises/b2/parseB.hs
rename to topics/implementation/b/parsing/parseB.hs
diff --git a/topics/exercises/b1/Makefile b/topics/implementation/b/syntax/Makefile
similarity index 100%
rename from topics/exercises/b1/Makefile
rename to topics/implementation/b/syntax/Makefile
diff --git a/topics/exercises/b1/input.txt b/topics/implementation/b/syntax/input.txt
similarity index 100%
rename from topics/exercises/b1/input.txt
rename to topics/implementation/b/syntax/input.txt
diff --git a/topics/exercises/b1/syntax.pro b/topics/implementation/b/syntax/syntax.pro
similarity index 100%
rename from topics/exercises/b1/syntax.pro
rename to topics/implementation/b/syntax/syntax.pro
diff --git a/topics/exercises/haskell1/Makefile b/topics/implementation/exercises/Makefile
similarity index 100%
rename from topics/exercises/haskell1/Makefile
rename to topics/implementation/exercises/Makefile
diff --git a/topics/exercises/haskell1/test.hs b/topics/implementation/exercises/test.hs
similarity index 100%
rename from topics/exercises/haskell1/test.hs
rename to topics/implementation/exercises/test.hs
diff --git a/topics/exercises/fixed/Makefile b/topics/implementation/fixed/Makefile
similarity index 100%
rename from topics/exercises/fixed/Makefile
rename to topics/implementation/fixed/Makefile
diff --git a/topics/exercises/fixed/fixedPoint.hs b/topics/implementation/fixed/fixedPoint.hs
similarity index 100%
rename from topics/exercises/fixed/fixedPoint.hs
rename to topics/implementation/fixed/fixedPoint.hs
diff --git a/topics/exercises/nb4/Evaluation.hs b/topics/implementation/nb/expression/Evaluation.hs
similarity index 100%
rename from topics/exercises/nb4/Evaluation.hs
rename to topics/implementation/nb/expression/Evaluation.hs
diff --git a/topics/exercises/nb4/Makefile b/topics/implementation/nb/expression/Makefile
similarity index 100%
rename from topics/exercises/nb4/Makefile
rename to topics/implementation/nb/expression/Makefile
diff --git a/topics/exercises/nb4/RunEval.hs b/topics/implementation/nb/expression/RunEval.hs
similarity index 100%
rename from topics/exercises/nb4/RunEval.hs
rename to topics/implementation/nb/expression/RunEval.hs
diff --git a/topics/exercises/nb4/Syntax.hs b/topics/implementation/nb/expression/Syntax.hs
similarity index 100%
rename from topics/exercises/nb4/Syntax.hs
rename to topics/implementation/nb/expression/Syntax.hs
diff --git a/topics/exercises/nb3/FoldNB.hs b/topics/implementation/nb/folding/FoldNB.hs
similarity index 100%
rename from topics/exercises/nb3/FoldNB.hs
rename to topics/implementation/nb/folding/FoldNB.hs
diff --git a/topics/exercises/nb3/Makefile b/topics/implementation/nb/folding/Makefile
similarity index 100%
rename from topics/exercises/nb3/Makefile
rename to topics/implementation/nb/folding/Makefile
diff --git a/topics/exercises/nb3/NB.hs b/topics/implementation/nb/folding/NB.hs
similarity index 100%
rename from topics/exercises/nb3/NB.hs
rename to topics/implementation/nb/folding/NB.hs
diff --git a/topics/exercises/nb3/ParseNB.hs b/topics/implementation/nb/folding/ParseNB.hs
similarity index 100%
rename from topics/exercises/nb3/ParseNB.hs
rename to topics/implementation/nb/folding/ParseNB.hs
diff --git a/topics/exercises/nb3/Test.hs b/topics/implementation/nb/folding/Test.hs
similarity index 100%
rename from topics/exercises/nb3/Test.hs
rename to topics/implementation/nb/folding/Test.hs
diff --git a/topics/parsing/nb/AbstractSyntax.hs b/topics/implementation/nb/syntax-haskell/AbstractSyntax.hs
similarity index 100%
rename from topics/parsing/nb/AbstractSyntax.hs
rename to topics/implementation/nb/syntax-haskell/AbstractSyntax.hs
diff --git a/topics/parsing/nb/Makefile b/topics/implementation/nb/syntax-haskell/Makefile
similarity index 100%
rename from topics/parsing/nb/Makefile
rename to topics/implementation/nb/syntax-haskell/Makefile
diff --git a/topics/parsing/nb/Parser.hs b/topics/implementation/nb/syntax-haskell/Parser.hs
similarity index 100%
rename from topics/parsing/nb/Parser.hs
rename to topics/implementation/nb/syntax-haskell/Parser.hs
diff --git a/topics/parsing/nb/ParserLib.lhs b/topics/implementation/nb/syntax-haskell/ParserLib.lhs
similarity index 100%
rename from topics/parsing/nb/ParserLib.lhs
rename to topics/implementation/nb/syntax-haskell/ParserLib.lhs
diff --git a/topics/parsing/nb/Test.hs b/topics/implementation/nb/syntax-haskell/Test.hs
similarity index 100%
rename from topics/parsing/nb/Test.hs
rename to topics/implementation/nb/syntax-haskell/Test.hs
diff --git a/topics/exercises/nb1/Makefile b/topics/implementation/nb/syntax-prolog/Makefile
similarity index 100%
rename from topics/exercises/nb1/Makefile
rename to topics/implementation/nb/syntax-prolog/Makefile
diff --git a/topics/exercises/nb1/input.txt b/topics/implementation/nb/syntax-prolog/input.txt
similarity index 100%
rename from topics/exercises/nb1/input.txt
rename to topics/implementation/nb/syntax-prolog/input.txt
diff --git a/topics/exercises/nb1/syntax.pro b/topics/implementation/nb/syntax-prolog/syntax.pro
similarity index 100%
rename from topics/exercises/nb1/syntax.pro
rename to topics/implementation/nb/syntax-prolog/syntax.pro
diff --git a/topics/exercises/clp/Makefile b/topics/implementation/palindrom/Makefile
similarity index 100%
rename from topics/exercises/clp/Makefile
rename to topics/implementation/palindrom/Makefile
diff --git a/topics/implementation/palindrom/README.txt b/topics/implementation/palindrom/README.txt
new file mode 100644
index 00000000..df848224
--- /dev/null
+++ b/topics/implementation/palindrom/README.txt
@@ -0,0 +1,3 @@
+Constraint Logic Programming in Prolog (palindrom dates)
+
+has been used in a course by Laemmel/Zaytsev.
diff --git a/topics/exercises/clp/pdate.pro b/topics/implementation/palindrom/pdate.pro
similarity index 100%
rename from topics/exercises/clp/pdate.pro
rename to topics/implementation/palindrom/pdate.pro
diff --git a/topics/exercises/shapes/Makefile b/topics/implementation/shapes/Makefile
similarity index 100%
rename from topics/exercises/shapes/Makefile
rename to topics/implementation/shapes/Makefile
diff --git a/topics/exercises/shapes/RunShapes.pro b/topics/implementation/shapes/RunShapes.pro
similarity index 100%
rename from topics/exercises/shapes/RunShapes.pro
rename to topics/implementation/shapes/RunShapes.pro
diff --git a/topics/exercises/shapes/Shapes.pro b/topics/implementation/shapes/Shapes.pro
similarity index 100%
rename from topics/exercises/shapes/Shapes.pro
rename to topics/implementation/shapes/Shapes.pro
diff --git a/topics/exercises/xml2/Makefile b/topics/implementation/xml/attributes/Makefile
similarity index 100%
rename from topics/exercises/xml2/Makefile
rename to topics/implementation/xml/attributes/Makefile
diff --git a/topics/exercises/xml2/Parser.pro b/topics/implementation/xml/attributes/Parser.pro
similarity index 100%
rename from topics/exercises/xml2/Parser.pro
rename to topics/implementation/xml/attributes/Parser.pro
diff --git a/topics/exercises/xml1/RunParser.pro b/topics/implementation/xml/attributes/RunParser.pro
similarity index 100%
rename from topics/exercises/xml1/RunParser.pro
rename to topics/implementation/xml/attributes/RunParser.pro
diff --git a/topics/exercises/xml2/bad.txt b/topics/implementation/xml/attributes/bad.txt
similarity index 100%
rename from topics/exercises/xml2/bad.txt
rename to topics/implementation/xml/attributes/bad.txt
diff --git a/topics/exercises/xml2/input.txt b/topics/implementation/xml/attributes/input.txt
similarity index 100%
rename from topics/exercises/xml2/input.txt
rename to topics/implementation/xml/attributes/input.txt
diff --git a/topics/exercises/xml1/Makefile b/topics/implementation/xml/elements/Makefile
similarity index 100%
rename from topics/exercises/xml1/Makefile
rename to topics/implementation/xml/elements/Makefile
diff --git a/topics/exercises/xml1/Parser.pro b/topics/implementation/xml/elements/Parser.pro
similarity index 100%
rename from topics/exercises/xml1/Parser.pro
rename to topics/implementation/xml/elements/Parser.pro
diff --git a/topics/exercises/xml2/RunParser.pro b/topics/implementation/xml/elements/RunParser.pro
similarity index 100%
rename from topics/exercises/xml2/RunParser.pro
rename to topics/implementation/xml/elements/RunParser.pro
diff --git a/topics/exercises/xml1/input.txt b/topics/implementation/xml/elements/input.txt
similarity index 100%
rename from topics/exercises/xml1/input.txt
rename to topics/implementation/xml/elements/input.txt
diff --git a/topics/java/README.txt b/topics/java/README.txt
deleted file mode 100644
index fba80ca1..00000000
--- a/topics/java/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-This directory is obsolete. Let these GOTOs be considered helpful.
-
-For grammars of Java, go to:
-	topics/grammars/java/jls?/*
-For extraction of Java grammars from JLS sources, go to:
-	topics/extraction/bnf2bgf/*
-For regular convergence of Java grammars, go to:
-	topics/convergence/java/*
-For a sliced scenario of convergence of Java grammars, go to:
-	topics/convergence/java-sliced/*
-For the scientific paper(s) presenting the results of Java convergence, go to:
-	http://www.uni-koblenz.de/~laemmel/jls/
-
diff --git a/topics/partialevaluation/simplepe/Evaluator.hs b/topics/partial-evaluation/simplepe/Evaluator.hs
similarity index 100%
rename from topics/partialevaluation/simplepe/Evaluator.hs
rename to topics/partial-evaluation/simplepe/Evaluator.hs
diff --git a/topics/partialevaluation/simplepe/PartialEvaluator.hs b/topics/partial-evaluation/simplepe/PartialEvaluator.hs
similarity index 100%
rename from topics/partialevaluation/simplepe/PartialEvaluator.hs
rename to topics/partial-evaluation/simplepe/PartialEvaluator.hs
diff --git a/topics/partialevaluation/simplepe/README b/topics/partial-evaluation/simplepe/README
similarity index 100%
rename from topics/partialevaluation/simplepe/README
rename to topics/partial-evaluation/simplepe/README
diff --git a/topics/partialevaluation/simplepe/Simplifier.hs b/topics/partial-evaluation/simplepe/Simplifier.hs
similarity index 100%
rename from topics/partialevaluation/simplepe/Simplifier.hs
rename to topics/partial-evaluation/simplepe/Simplifier.hs
diff --git a/topics/partialevaluation/simplepe/Substitution.hs b/topics/partial-evaluation/simplepe/Substitution.hs
similarity index 100%
rename from topics/partialevaluation/simplepe/Substitution.hs
rename to topics/partial-evaluation/simplepe/Substitution.hs
diff --git a/topics/partialevaluation/simplepe/Syntax.hs b/topics/partial-evaluation/simplepe/Syntax.hs
similarity index 100%
rename from topics/partialevaluation/simplepe/Syntax.hs
rename to topics/partial-evaluation/simplepe/Syntax.hs
diff --git a/topics/partialevaluation/simplepe/TrivialPartialEvaluator.hs b/topics/partial-evaluation/simplepe/TrivialPartialEvaluator.hs
similarity index 100%
rename from topics/partialevaluation/simplepe/TrivialPartialEvaluator.hs
rename to topics/partial-evaluation/simplepe/TrivialPartialEvaluator.hs
diff --git a/topics/semantics/ccs/README.txt b/topics/semantics/ccs/README.txt
new file mode 100644
index 00000000..18ab071e
--- /dev/null
+++ b/topics/semantics/ccs/README.txt
@@ -0,0 +1,5 @@
+Calculus of Communicating Systems in Prolog
+
+jobshop1.pro — simpler version done by Zaytsev
+jobshop.pro — better version by Lämmel
+
diff --git a/topics/exercises/ccs/JobShop.pro b/topics/semantics/ccs/jobshop1.pro
similarity index 100%
rename from topics/exercises/ccs/JobShop.pro
rename to topics/semantics/ccs/jobshop1.pro
diff --git a/topics/exercises/lambda5/Evaluation.pro b/topics/semantics/lambda/alpha/Evaluation.pro
similarity index 100%
rename from topics/exercises/lambda5/Evaluation.pro
rename to topics/semantics/lambda/alpha/Evaluation.pro
diff --git a/topics/exercises/lambda5/FV.pro b/topics/semantics/lambda/alpha/FV.pro
similarity index 100%
rename from topics/exercises/lambda5/FV.pro
rename to topics/semantics/lambda/alpha/FV.pro
diff --git a/topics/exercises/lambda5/Makefile b/topics/semantics/lambda/alpha/Makefile
similarity index 100%
rename from topics/exercises/lambda5/Makefile
rename to topics/semantics/lambda/alpha/Makefile
diff --git a/topics/exercises/lambda5/Substitution.pro b/topics/semantics/lambda/alpha/Substitution.pro
similarity index 100%
rename from topics/exercises/lambda5/Substitution.pro
rename to topics/semantics/lambda/alpha/Substitution.pro
diff --git a/topics/exercises/lambda5/Syntax.pro b/topics/semantics/lambda/alpha/Syntax.pro
similarity index 100%
rename from topics/exercises/lambda5/Syntax.pro
rename to topics/semantics/lambda/alpha/Syntax.pro
diff --git a/topics/exercises/lambda5/Test.pro b/topics/semantics/lambda/alpha/Test.pro
similarity index 100%
rename from topics/exercises/lambda5/Test.pro
rename to topics/semantics/lambda/alpha/Test.pro
diff --git a/topics/exercises/lambda5/Typing.pro b/topics/semantics/lambda/alpha/Typing.pro
similarity index 100%
rename from topics/exercises/lambda5/Typing.pro
rename to topics/semantics/lambda/alpha/Typing.pro
diff --git a/topics/exercises/lambda6/Evaluation.pro b/topics/semantics/lambda/fixed/Evaluation.pro
similarity index 100%
rename from topics/exercises/lambda6/Evaluation.pro
rename to topics/semantics/lambda/fixed/Evaluation.pro
diff --git a/topics/exercises/lambda6/FV.pro b/topics/semantics/lambda/fixed/FV.pro
similarity index 100%
rename from topics/exercises/lambda6/FV.pro
rename to topics/semantics/lambda/fixed/FV.pro
diff --git a/topics/exercises/lambda6/Makefile b/topics/semantics/lambda/fixed/Makefile
similarity index 100%
rename from topics/exercises/lambda6/Makefile
rename to topics/semantics/lambda/fixed/Makefile
diff --git a/topics/exercises/lambda6/Substitution.pro b/topics/semantics/lambda/fixed/Substitution.pro
similarity index 100%
rename from topics/exercises/lambda6/Substitution.pro
rename to topics/semantics/lambda/fixed/Substitution.pro
diff --git a/topics/exercises/lambda6/Syntax.pro b/topics/semantics/lambda/fixed/Syntax.pro
similarity index 100%
rename from topics/exercises/lambda6/Syntax.pro
rename to topics/semantics/lambda/fixed/Syntax.pro
diff --git a/topics/exercises/lambda6/Test.pro b/topics/semantics/lambda/fixed/Test.pro
similarity index 100%
rename from topics/exercises/lambda6/Test.pro
rename to topics/semantics/lambda/fixed/Test.pro
diff --git a/topics/exercises/lambda6/Typing.pro b/topics/semantics/lambda/fixed/Typing.pro
similarity index 100%
rename from topics/exercises/lambda6/Typing.pro
rename to topics/semantics/lambda/fixed/Typing.pro
diff --git a/topics/exercises/while3/Makefile b/topics/semantics/while/big/Makefile
similarity index 100%
rename from topics/exercises/while3/Makefile
rename to topics/semantics/while/big/Makefile
diff --git a/topics/exercises/while3/Parser.pro b/topics/semantics/while/big/Parser.pro
similarity index 100%
rename from topics/exercises/while3/Parser.pro
rename to topics/semantics/while/big/Parser.pro
diff --git a/topics/exercises/while3/RunEvaluator.pro b/topics/semantics/while/big/RunEvaluator.pro
similarity index 100%
rename from topics/exercises/while3/RunEvaluator.pro
rename to topics/semantics/while/big/RunEvaluator.pro
diff --git a/topics/exercises/while3/bigStm.pro b/topics/semantics/while/big/bigStm.pro
similarity index 100%
rename from topics/exercises/while3/bigStm.pro
rename to topics/semantics/while/big/bigStm.pro
diff --git a/topics/exercises/while3/compExpr.pro b/topics/semantics/while/big/compExpr.pro
similarity index 100%
rename from topics/exercises/while3/compExpr.pro
rename to topics/semantics/while/big/compExpr.pro
diff --git a/topics/exercises/while3/input.txt b/topics/semantics/while/big/input.txt
similarity index 100%
rename from topics/exercises/while3/input.txt
rename to topics/semantics/while/big/input.txt
diff --git a/topics/exercises/while3/mappings.pro b/topics/semantics/while/big/mappings.pro
similarity index 100%
rename from topics/exercises/while3/mappings.pro
rename to topics/semantics/while/big/mappings.pro
diff --git a/topics/exercises/while6/Makefile b/topics/semantics/while/eval-incomplete/Makefile
similarity index 100%
rename from topics/exercises/while6/Makefile
rename to topics/semantics/while/eval-incomplete/Makefile
diff --git a/topics/exercises/while6/while.hs b/topics/semantics/while/eval-incomplete/while.hs
similarity index 100%
rename from topics/exercises/while6/while.hs
rename to topics/semantics/while/eval-incomplete/while.hs
diff --git a/topics/exercises/while7/Makefile b/topics/semantics/while/evaluation/Makefile
similarity index 100%
rename from topics/exercises/while7/Makefile
rename to topics/semantics/while/evaluation/Makefile
diff --git a/topics/exercises/while7/while.hs b/topics/semantics/while/evaluation/while.hs
similarity index 100%
rename from topics/exercises/while7/while.hs
rename to topics/semantics/while/evaluation/while.hs
diff --git a/topics/exercises/while8/Evaluation.hs b/topics/semantics/while/execution/Evaluation.hs
similarity index 100%
rename from topics/exercises/while8/Evaluation.hs
rename to topics/semantics/while/execution/Evaluation.hs
diff --git a/topics/exercises/while8/Execution.hs b/topics/semantics/while/execution/Execution.hs
similarity index 100%
rename from topics/exercises/while8/Execution.hs
rename to topics/semantics/while/execution/Execution.hs
diff --git a/topics/exercises/while8/Makefile b/topics/semantics/while/execution/Makefile
similarity index 100%
rename from topics/exercises/while8/Makefile
rename to topics/semantics/while/execution/Makefile
diff --git a/topics/exercises/while8/Syntax.hs b/topics/semantics/while/execution/Syntax.hs
similarity index 100%
rename from topics/exercises/while8/Syntax.hs
rename to topics/semantics/while/execution/Syntax.hs
diff --git a/topics/exercises/while8/Test.hs b/topics/semantics/while/execution/Test.hs
similarity index 100%
rename from topics/exercises/while8/Test.hs
rename to topics/semantics/while/execution/Test.hs
diff --git a/topics/exercises/ewhile/Evaluation.hs b/topics/semantics/while/extended/Evaluation.hs
similarity index 100%
rename from topics/exercises/ewhile/Evaluation.hs
rename to topics/semantics/while/extended/Evaluation.hs
diff --git a/topics/exercises/ewhile/Execution.hs b/topics/semantics/while/extended/Execution.hs
similarity index 100%
rename from topics/exercises/ewhile/Execution.hs
rename to topics/semantics/while/extended/Execution.hs
diff --git a/topics/exercises/ewhile/Makefile b/topics/semantics/while/extended/Makefile
similarity index 100%
rename from topics/exercises/ewhile/Makefile
rename to topics/semantics/while/extended/Makefile
diff --git a/topics/exercises/ewhile/Syntax.hs b/topics/semantics/while/extended/Syntax.hs
similarity index 100%
rename from topics/exercises/ewhile/Syntax.hs
rename to topics/semantics/while/extended/Syntax.hs
diff --git a/topics/exercises/ewhile/Test.hs b/topics/semantics/while/extended/Test.hs
similarity index 100%
rename from topics/exercises/ewhile/Test.hs
rename to topics/semantics/while/extended/Test.hs
diff --git a/topics/exercises/while_sign/Main.hs b/topics/semantics/while/sign-detection/Main.hs
similarity index 100%
rename from topics/exercises/while_sign/Main.hs
rename to topics/semantics/while/sign-detection/Main.hs
diff --git a/topics/exercises/while_sign/Main.ref b/topics/semantics/while/sign-detection/Main.ref
similarity index 100%
rename from topics/exercises/while_sign/Main.ref
rename to topics/semantics/while/sign-detection/Main.ref
diff --git a/topics/exercises/while_sign/Makefile b/topics/semantics/while/sign-detection/Makefile
similarity index 100%
rename from topics/exercises/while_sign/Makefile
rename to topics/semantics/while/sign-detection/Makefile
diff --git a/topics/exercises/while_sign/README b/topics/semantics/while/sign-detection/README
similarity index 100%
rename from topics/exercises/while_sign/README
rename to topics/semantics/while/sign-detection/README
diff --git a/topics/exercises/while_sign/Sign.hs b/topics/semantics/while/sign-detection/Sign.hs
similarity index 100%
rename from topics/exercises/while_sign/Sign.hs
rename to topics/semantics/while/sign-detection/Sign.hs
diff --git a/topics/exercises/while4/Makefile b/topics/semantics/while/small/Makefile
similarity index 100%
rename from topics/exercises/while4/Makefile
rename to topics/semantics/while/small/Makefile
diff --git a/topics/exercises/while4/Parser.pro b/topics/semantics/while/small/Parser.pro
similarity index 100%
rename from topics/exercises/while4/Parser.pro
rename to topics/semantics/while/small/Parser.pro
diff --git a/topics/exercises/while4/RunEvaluator.pro b/topics/semantics/while/small/RunEvaluator.pro
similarity index 100%
rename from topics/exercises/while4/RunEvaluator.pro
rename to topics/semantics/while/small/RunEvaluator.pro
diff --git a/topics/exercises/while4/compExpr.pro b/topics/semantics/while/small/compExpr.pro
similarity index 100%
rename from topics/exercises/while4/compExpr.pro
rename to topics/semantics/while/small/compExpr.pro
diff --git a/topics/exercises/while4/input.txt b/topics/semantics/while/small/input.txt
similarity index 100%
rename from topics/exercises/while4/input.txt
rename to topics/semantics/while/small/input.txt
diff --git a/topics/exercises/while4/mappings.pro b/topics/semantics/while/small/mappings.pro
similarity index 100%
rename from topics/exercises/while4/mappings.pro
rename to topics/semantics/while/small/mappings.pro
diff --git a/topics/exercises/while4/smallStm.pro b/topics/semantics/while/small/smallStm.pro
similarity index 100%
rename from topics/exercises/while4/smallStm.pro
rename to topics/semantics/while/small/smallStm.pro
diff --git a/topics/exercises/while5/Makefile b/topics/semantics/while/typed/Makefile
similarity index 100%
rename from topics/exercises/while5/Makefile
rename to topics/semantics/while/typed/Makefile
diff --git a/topics/exercises/while5/Parser.pro b/topics/semantics/while/typed/Parser.pro
similarity index 100%
rename from topics/exercises/while5/Parser.pro
rename to topics/semantics/while/typed/Parser.pro
diff --git a/topics/exercises/while5/RunTypeChecker.pro b/topics/semantics/while/typed/RunTypeChecker.pro
similarity index 100%
rename from topics/exercises/while5/RunTypeChecker.pro
rename to topics/semantics/while/typed/RunTypeChecker.pro
diff --git a/topics/exercises/while5/Types.pro b/topics/semantics/while/typed/Types.pro
similarity index 100%
rename from topics/exercises/while5/Types.pro
rename to topics/semantics/while/typed/Types.pro
diff --git a/topics/exercises/while5/compExpr.pro b/topics/semantics/while/typed/compExpr.pro
similarity index 100%
rename from topics/exercises/while5/compExpr.pro
rename to topics/semantics/while/typed/compExpr.pro
diff --git a/topics/exercises/while5/input.txt b/topics/semantics/while/typed/input.txt
similarity index 100%
rename from topics/exercises/while5/input.txt
rename to topics/semantics/while/typed/input.txt
diff --git a/topics/exercises/while5/mappings.pro b/topics/semantics/while/typed/mappings.pro
similarity index 100%
rename from topics/exercises/while5/mappings.pro
rename to topics/semantics/while/typed/mappings.pro
diff --git a/topics/exercises/while5/smallStm.pro b/topics/semantics/while/typed/smallStm.pro
similarity index 100%
rename from topics/exercises/while5/smallStm.pro
rename to topics/semantics/while/typed/smallStm.pro