diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/carSlope.fig b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/carSlope.fig
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/carSlope.fig
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/carSlope.fig
diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/class.svg b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/class.svg
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/class.svg
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/class.svg
diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/codingbatSleepExample.bmp b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/codingbatSleepExample.bmp
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/codingbatSleepExample.bmp
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/codingbatSleepExample.bmp
diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/freedocs.svg b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/freedocs.svg
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/freedocs.svg
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/freedocs.svg
diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/hashing.svg b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/hashing.svg
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/hashing.svg
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/hashing.svg
diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/keycard.jpg b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/keycard.jpg
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/keycard.jpg
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/keycard.jpg
diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/recumbent.png b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/recumbent.png
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/recumbent.png
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/recumbent.png
diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/recumbent.png.marked.svg b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/recumbent.png.marked.svg
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/recumbent.png.marked.svg
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/recumbent.png.marked.svg
diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/saxcharacter.pdf b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/saxcharacter.pdf
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/saxcharacter.pdf
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/saxcharacter.pdf
diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/xhtml.svg b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/xhtml.svg
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/xhtml.svg
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/xhtml.svg
diff --git a/ws/Docbook/Extensions/Tdata/Components/Ref/Fig/xpathaxisdefs.fig b/ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/xpathaxisdefs.fig
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/Ref/Fig/xpathaxisdefs.fig
rename to ws/Docbook/Extensions/Tdata/Common/Components/Ref/Fig/xpathaxisdefs.fig
diff --git a/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml b/ws/Docbook/Extensions/Tdata/Common/Components/exampleSlides.xml
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
rename to ws/Docbook/Extensions/Tdata/Common/Components/exampleSlides.xml
diff --git a/ws/Docbook/Extensions/Tdata/Components/intro.xml b/ws/Docbook/Extensions/Tdata/Common/Components/intro.xml
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Components/intro.xml
rename to ws/Docbook/Extensions/Tdata/Common/Components/intro.xml
diff --git a/ws/Docbook/Extensions/Tdata/Makefile.in b/ws/Docbook/Extensions/Tdata/Common/Makefile.in
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Makefile.in
rename to ws/Docbook/Extensions/Tdata/Common/Makefile.in
diff --git a/ws/Docbook/Extensions/Tdata/Video/Ref/Video/jdbcDriverConfig.webm b/ws/Docbook/Extensions/Tdata/Common/Video/Ref/Video/jdbcDriverConfig.webm
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Video/Ref/Video/jdbcDriverConfig.webm
rename to ws/Docbook/Extensions/Tdata/Common/Video/Ref/Video/jdbcDriverConfig.webm
diff --git a/ws/Docbook/Extensions/Tdata/Video/video.xml b/ws/Docbook/Extensions/Tdata/Common/Video/video.xml
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/Video/video.xml
rename to ws/Docbook/Extensions/Tdata/Common/Video/video.xml
diff --git a/ws/Docbook/Extensions/Tdata/bibGloss.xml b/ws/Docbook/Extensions/Tdata/Common/bibGloss.xml
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/bibGloss.xml
rename to ws/Docbook/Extensions/Tdata/Common/bibGloss.xml
diff --git a/ws/Docbook/Extensions/Tdata/fig.xml b/ws/Docbook/Extensions/Tdata/Common/fig.xml
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/fig.xml
rename to ws/Docbook/Extensions/Tdata/Common/fig.xml
diff --git a/ws/Docbook/Extensions/Tdata/glosslist.xml b/ws/Docbook/Extensions/Tdata/Common/glosslist.xml
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/glosslist.xml
rename to ws/Docbook/Extensions/Tdata/Common/glosslist.xml
diff --git a/ws/Docbook/Extensions/Tdata/lastAnswerId.xml b/ws/Docbook/Extensions/Tdata/Common/lastAnswerId.xml
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/lastAnswerId.xml
rename to ws/Docbook/Extensions/Tdata/Common/lastAnswerId.xml
diff --git a/ws/Docbook/Extensions/Tdata/qanda.xml b/ws/Docbook/Extensions/Tdata/Common/qanda.xml
similarity index 100%
rename from ws/Docbook/Extensions/Tdata/qanda.xml
rename to ws/Docbook/Extensions/Tdata/Common/qanda.xml