diff --git a/Doc/Sd1/Ref/Screen/bonusJavadocCompileTimeProblems.png b/Doc/Sd1/Ref/Fig/bonusJavadocCompileTimeProblems.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/bonusJavadocCompileTimeProblems.png
rename to Doc/Sd1/Ref/Fig/bonusJavadocCompileTimeProblems.png
diff --git a/Doc/Sd1/Ref/Screen/bonusJavadocMismatch.png b/Doc/Sd1/Ref/Fig/bonusJavadocMismatch.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/bonusJavadocMismatch.png
rename to Doc/Sd1/Ref/Fig/bonusJavadocMismatch.png
diff --git a/Doc/Sd1/Ref/Screen/cloneGitRepository.png b/Doc/Sd1/Ref/Fig/cloneGitRepository.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/cloneGitRepository.png
rename to Doc/Sd1/Ref/Fig/cloneGitRepository.png
diff --git a/Doc/Sd1/Ref/Screen/codingbatSleepExample.bmp b/Doc/Sd1/Ref/Fig/codingbatSleepExample.bmp
similarity index 100%
rename from Doc/Sd1/Ref/Screen/codingbatSleepExample.bmp
rename to Doc/Sd1/Ref/Fig/codingbatSleepExample.bmp
diff --git a/Doc/Sd1/Ref/Screen/lotto-spiel77.jpg b/Doc/Sd1/Ref/Fig/lotto-spiel77.jpg
similarity index 100%
rename from Doc/Sd1/Ref/Screen/lotto-spiel77.jpg
rename to Doc/Sd1/Ref/Fig/lotto-spiel77.jpg
diff --git a/Doc/Sd1/Ref/Screen/mavenDownloadJavadoc.png b/Doc/Sd1/Ref/Fig/mavenDownloadJavadoc.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/mavenDownloadJavadoc.png
rename to Doc/Sd1/Ref/Fig/mavenDownloadJavadoc.png
diff --git a/Doc/Sd1/Ref/Screen/mavenMiArchetypes.png b/Doc/Sd1/Ref/Fig/mavenMiArchetypes.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/mavenMiArchetypes.png
rename to Doc/Sd1/Ref/Fig/mavenMiArchetypes.png
diff --git a/Doc/Sd1/Ref/Screen/mavenOwncloud.png b/Doc/Sd1/Ref/Fig/mavenOwncloud.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/mavenOwncloud.png
rename to Doc/Sd1/Ref/Fig/mavenOwncloud.png
diff --git a/Doc/Sd1/Ref/Screen/navigationSections.png b/Doc/Sd1/Ref/Fig/navigationSections.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/navigationSections.png
rename to Doc/Sd1/Ref/Fig/navigationSections.png
diff --git a/Doc/Sd1/Ref/Screen/owncloudSetup.png b/Doc/Sd1/Ref/Fig/owncloudSetup.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/owncloudSetup.png
rename to Doc/Sd1/Ref/Fig/owncloudSetup.png
diff --git a/Doc/Sd1/Ref/Screen/packageHierarchy.png b/Doc/Sd1/Ref/Fig/packageHierarchy.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/packageHierarchy.png
rename to Doc/Sd1/Ref/Fig/packageHierarchy.png
diff --git a/Doc/Sd1/Ref/Screen/primDriverRunConfigOverview.bmp b/Doc/Sd1/Ref/Fig/primDriverRunConfigOverview.bmp
similarity index 100%
rename from Doc/Sd1/Ref/Screen/primDriverRunConfigOverview.bmp
rename to Doc/Sd1/Ref/Fig/primDriverRunConfigOverview.bmp
diff --git a/Doc/Sd1/Ref/Screen/primDriverRunConfigVmOptions.bmp b/Doc/Sd1/Ref/Fig/primDriverRunConfigVmOptions.bmp
similarity index 100%
rename from Doc/Sd1/Ref/Screen/primDriverRunConfigVmOptions.bmp
rename to Doc/Sd1/Ref/Fig/primDriverRunConfigVmOptions.bmp
diff --git a/Doc/Sd1/Ref/Screen/squareTable.png b/Doc/Sd1/Ref/Fig/squareTable.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/squareTable.png
rename to Doc/Sd1/Ref/Fig/squareTable.png
diff --git a/Doc/Sd1/Ref/Screen/stringByConcat.bmp b/Doc/Sd1/Ref/Fig/stringByConcat.bmp
similarity index 100%
rename from Doc/Sd1/Ref/Screen/stringByConcat.bmp
rename to Doc/Sd1/Ref/Fig/stringByConcat.bmp
diff --git a/Doc/Sd1/Ref/Screen/stringByOperatorPlus.bmp b/Doc/Sd1/Ref/Fig/stringByOperatorPlus.bmp
similarity index 100%
rename from Doc/Sd1/Ref/Screen/stringByOperatorPlus.bmp
rename to Doc/Sd1/Ref/Fig/stringByOperatorPlus.bmp
diff --git a/Doc/Sd1/Ref/Screen/strings2html.png b/Doc/Sd1/Ref/Fig/strings2html.png
similarity index 100%
rename from Doc/Sd1/Ref/Screen/strings2html.png
rename to Doc/Sd1/Ref/Fig/strings2html.png
diff --git a/Doc/Sd1/Ref/Screen/superenalotto.gif b/Doc/Sd1/Ref/Fig/superenalotto.gif
similarity index 100%
rename from Doc/Sd1/Ref/Screen/superenalotto.gif
rename to Doc/Sd1/Ref/Fig/superenalotto.gif
diff --git a/Doc/Sd1/Ref/Screen/importSpecificProject.png b/Doc/Sd1/Ref/Screen/importSpecificProject.png
deleted file mode 100644
index 630d9733a7a4ab1db644bd3b9e5cacdcccefe7e0..0000000000000000000000000000000000000000
Binary files a/Doc/Sd1/Ref/Screen/importSpecificProject.png and /dev/null differ
diff --git a/Doc/Sd1/appendix.xml b/Doc/Sd1/appendix.xml
index b0ecc3a40a083201df3f349963d6faaeca0d1f8d..f90c25e40d210221184ba90b97bc3d466e91e048 100644
--- a/Doc/Sd1/appendix.xml
+++ b/Doc/Sd1/appendix.xml
@@ -205,7 +205,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/bonusJavadocCompileTimeProblems.png"/>
+ <imagedata fileref="Ref/Fig/bonusJavadocCompileTimeProblems.png"/>
</imageobject>
</mediaobject>
</glossdef>
@@ -224,7 +224,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/bonusJavadocMismatch.png"/>
+ <imagedata fileref="Ref/Fig/bonusJavadocMismatch.png"/>
</imageobject>
</mediaobject>
@@ -659,7 +659,7 @@ Value 2147483645 is not prime.
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/primDriverRunConfigOverview.bmp"/>
+ <imagedata fileref="Ref/Fig/primDriverRunConfigOverview.bmp"/>
</imageobject>
</mediaobject>
</informalfigure>
@@ -670,7 +670,7 @@ Value 2147483645 is not prime.
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/primDriverRunConfigVmOptions.bmp"/>
+ <imagedata fileref="Ref/Fig/primDriverRunConfigVmOptions.bmp"/>
</imageobject>
</mediaobject>
</informalfigure>
diff --git a/Doc/Sd1/arrays.xml b/Doc/Sd1/arrays.xml
index 3a87a180f9f5a23db1615febee513ddfbd1d209c..023a7443ead1e74aa90b67d7ed5d707ff9c763dc 100644
--- a/Doc/Sd1/arrays.xml
+++ b/Doc/Sd1/arrays.xml
@@ -58,7 +58,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/strings2html.png"/>
+ <imagedata fileref="Ref/Fig/strings2html.png"/>
</imageobject>
</mediaobject>
@@ -134,7 +134,7 @@
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/navigationSections.png"/>
+ <imagedata fileref="Ref/Fig/navigationSections.png"/>
</imageobject>
</mediaobject>
</informalfigure>
diff --git a/Doc/Sd1/coreClasses.xml b/Doc/Sd1/coreClasses.xml
index 649f40c10a0e5f7085ad73253f7b2838adef673c..beedbba6979625fb1f656047360d43b18e6d3e96 100644
--- a/Doc/Sd1/coreClasses.xml
+++ b/Doc/Sd1/coreClasses.xml
@@ -751,7 +751,7 @@ b1.equals(b2): true </programlisting>
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/stringByOperatorPlus.bmp"/>
+ <imagedata fileref="Ref/Fig/stringByOperatorPlus.bmp"/>
</imageobject>
</mediaobject>
</informalfigure>
@@ -775,7 +775,7 @@ b1.equals(b2): true </programlisting>
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/stringByConcat.bmp"/>
+ <imagedata fileref="Ref/Fig/stringByConcat.bmp"/>
</imageobject>
</mediaobject>
</informalfigure>
diff --git a/Doc/Sd1/objectsClasses.xml b/Doc/Sd1/objectsClasses.xml
index 9795da4b4013c35c742da52d95015a97f5066658..b14fc1d7f57fc31d387204b5fcae2162748a137e 100644
--- a/Doc/Sd1/objectsClasses.xml
+++ b/Doc/Sd1/objectsClasses.xml
@@ -46,7 +46,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/mavenMiArchetypes.png"/>
+ <imagedata fileref="Ref/Fig/mavenMiArchetypes.png"/>
</imageobject>
</mediaobject>
</listitem>
@@ -60,7 +60,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/mavenDownloadJavadoc.png"/>
+ <imagedata fileref="Ref/Fig/mavenDownloadJavadoc.png"/>
</imageobject>
</mediaobject>
@@ -125,7 +125,7 @@ javac 1.8.0_66</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/owncloudSetup.png"/>
+ <imagedata fileref="Ref/Fig/owncloudSetup.png"/>
</imageobject>
</mediaobject>
@@ -151,7 +151,7 @@ javac 1.8.0_66</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/mavenOwncloud.png"/>
+ <imagedata fileref="Ref/Fig/mavenOwncloud.png"/>
</imageobject>
</mediaobject>
</listitem>
@@ -179,7 +179,7 @@ javac 1.8.0_66</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/codingbatSleepExample.bmp"/>
+ <imagedata fileref="Ref/Fig/codingbatSleepExample.bmp"/>
</imageobject>
</mediaobject>
</figure>
@@ -236,7 +236,7 @@ javac 1.8.0_66</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/cloneGitRepository.png"/>
+ <imagedata fileref="Ref/Fig/cloneGitRepository.png"/>
</imageobject>
</mediaobject>
@@ -1429,7 +1429,7 @@ public class Driver {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/packageHierarchy.png"/>
+ <imagedata fileref="Ref/Fig/packageHierarchy.png"/>
</imageobject>
</mediaobject>
</screenshot>
diff --git a/Doc/Sd1/statements.xml b/Doc/Sd1/statements.xml
index 46d0eba12f7db5f8bec3d6b8b62f338bf910767b..fff670f7b152efe5ea08a98717ef17c10736ab4f 100644
--- a/Doc/Sd1/statements.xml
+++ b/Doc/Sd1/statements.xml
@@ -1223,7 +1223,7 @@ Decimal value 14 not yet implemented</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/squareTable.png"/>
+ <imagedata fileref="Ref/Fig/squareTable.png"/>
</imageobject>
</mediaobject>
</screenshot>
@@ -1260,7 +1260,7 @@ Decimal value 14 not yet implemented</programlisting>
<td><mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/lotto-spiel77.jpg"/>
+ <imagedata fileref="Ref/Fig/lotto-spiel77.jpg"/>
</imageobject>
</mediaobject></td>
</tr>
@@ -1282,7 +1282,7 @@ Decimal value 14 not yet implemented</programlisting>
<td><mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/superenalotto.gif"/>
+ <imagedata fileref="Ref/Fig/superenalotto.gif"/>
</imageobject>
</mediaobject></td>
</tr>
diff --git a/Doc/Sda1/Ref/Screen/dom-architecture.screen.png b/Doc/Sda1/Ref/Fig/dom-architecture.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/dom-architecture.screen.png
rename to Doc/Sda1/Ref/Fig/dom-architecture.screen.png
diff --git a/Doc/Sda1/Ref/Screen/eclipseOxygenSaxonEE.png b/Doc/Sda1/Ref/Fig/eclipseOxygenSaxonEE.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/eclipseOxygenSaxonEE.png
rename to Doc/Sda1/Ref/Fig/eclipseOxygenSaxonEE.png
diff --git a/Doc/Sda1/Ref/Screen/eclipseOxygenSaxonEnableValidation.png b/Doc/Sda1/Ref/Fig/eclipseOxygenSaxonEnableValidation.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/eclipseOxygenSaxonEnableValidation.png
rename to Doc/Sda1/Ref/Fig/eclipseOxygenSaxonEnableValidation.png
diff --git a/Doc/Sda1/Ref/Screen/employee.png b/Doc/Sda1/Ref/Fig/employee.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/employee.png
rename to Doc/Sda1/Ref/Fig/employee.png
diff --git a/Doc/Sda1/Ref/Screen/exploits_of_a_mom.png b/Doc/Sda1/Ref/Fig/exploits_of_a_mom.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/exploits_of_a_mom.png
rename to Doc/Sda1/Ref/Fig/exploits_of_a_mom.png
diff --git a/Doc/Sda1/Ref/Screen/externalize.screen.png b/Doc/Sda1/Ref/Fig/externalize.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/externalize.screen.png
rename to Doc/Sda1/Ref/Fig/externalize.screen.png
diff --git a/Doc/Sda1/Ref/Screen/externalize2.screen.png b/Doc/Sda1/Ref/Fig/externalize2.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/externalize2.screen.png
rename to Doc/Sda1/Ref/Fig/externalize2.screen.png
diff --git a/Doc/Sda1/Ref/Screen/genericXml2Html.png b/Doc/Sda1/Ref/Fig/genericXml2Html.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/genericXml2Html.png
rename to Doc/Sda1/Ref/Fig/genericXml2Html.png
diff --git a/Doc/Sda1/Ref/Screen/hello.screen.png b/Doc/Sda1/Ref/Fig/hello.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/hello.screen.png
rename to Doc/Sda1/Ref/Fig/hello.screen.png
diff --git a/Doc/Sda1/Ref/Screen/insertValidate.screen.png b/Doc/Sda1/Ref/Fig/insertValidate.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/insertValidate.screen.png
rename to Doc/Sda1/Ref/Fig/insertValidate.screen.png
diff --git a/Doc/Sda1/Ref/Screen/login.screen.png b/Doc/Sda1/Ref/Fig/login.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/login.screen.png
rename to Doc/Sda1/Ref/Fig/login.screen.png
diff --git a/Doc/Sda1/Ref/Screen/mediaFormat.png b/Doc/Sda1/Ref/Fig/mediaFormat.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/mediaFormat.png
rename to Doc/Sda1/Ref/Fig/mediaFormat.png
diff --git a/Doc/Sda1/Ref/Screen/mozparaspancss.screen.png b/Doc/Sda1/Ref/Fig/mozparaspancss.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/mozparaspancss.screen.png
rename to Doc/Sda1/Ref/Fig/mozparaspancss.screen.png
diff --git a/Doc/Sda1/Ref/Screen/nspaceElemFrequency.png b/Doc/Sda1/Ref/Fig/nspaceElemFrequency.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/nspaceElemFrequency.png
rename to Doc/Sda1/Ref/Fig/nspaceElemFrequency.png
diff --git a/Doc/Sda1/Ref/Screen/pdfbookmarks.screen.png b/Doc/Sda1/Ref/Fig/pdfbookmarks.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/pdfbookmarks.screen.png
rename to Doc/Sda1/Ref/Fig/pdfbookmarks.screen.png
diff --git a/Doc/Sda1/Ref/Screen/simpleInsertGui.screen.png b/Doc/Sda1/Ref/Fig/simpleInsertGui.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/simpleInsertGui.screen.png
rename to Doc/Sda1/Ref/Fig/simpleInsertGui.screen.png
diff --git a/Doc/Sda1/Ref/Screen/sqlInject.screen.png b/Doc/Sda1/Ref/Fig/sqlInject.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/sqlInject.screen.png
rename to Doc/Sda1/Ref/Fig/sqlInject.screen.png
diff --git a/Doc/Sda1/Ref/Screen/sqlInjectPrepare.screen.png b/Doc/Sda1/Ref/Fig/sqlInjectPrepare.screen.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/sqlInjectPrepare.screen.png
rename to Doc/Sda1/Ref/Fig/sqlInjectPrepare.screen.png
diff --git a/Doc/Sda1/Ref/Screen/sqldevelopAddMysqlJdbc.png b/Doc/Sda1/Ref/Fig/sqldevelopAddMysqlJdbc.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/sqldevelopAddMysqlJdbc.png
rename to Doc/Sda1/Ref/Fig/sqldevelopAddMysqlJdbc.png
diff --git a/Doc/Sda1/Ref/Screen/sqldevelopChooseMysqlpng.png b/Doc/Sda1/Ref/Fig/sqldevelopChooseMysqlpng.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/sqldevelopChooseMysqlpng.png
rename to Doc/Sda1/Ref/Fig/sqldevelopChooseMysqlpng.png
diff --git a/Doc/Sda1/Ref/Screen/track.png b/Doc/Sda1/Ref/Fig/track.png
similarity index 100%
rename from Doc/Sda1/Ref/Screen/track.png
rename to Doc/Sda1/Ref/Fig/track.png
diff --git a/Doc/Sda1/dom.xml b/Doc/Sda1/dom.xml
index ae108df42aa781dcbb45c996baac246e5fdbcd9d..bb7cc760d1d6bb34acd33435489dd3229e3ac091 100644
--- a/Doc/Sda1/dom.xml
+++ b/Doc/Sda1/dom.xml
@@ -235,7 +235,7 @@ public interface Node {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/dom-architecture.screen.png"/>
+ <imagedata fileref="Ref/Fig/dom-architecture.screen.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -1973,7 +1973,7 @@ public class Xml2HtmlDriver {
<td><informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/nspaceElemFrequency.png"/>
+ <imagedata fileref="Ref/Fig/nspaceElemFrequency.png"/>
</imageobject>
</mediaobject>
</informalfigure></td>
diff --git a/Doc/Sda1/fo.xml b/Doc/Sda1/fo.xml
index ba8a4d8aa43663767606486f642bdbd268f2df83..16c74c3fb16f3b89d0b654916d28a30ae5d62799 100644
--- a/Doc/Sda1/fo.xml
+++ b/Doc/Sda1/fo.xml
@@ -545,7 +545,7 @@
find a one-to-one correspondence between FO and CSS in this case. The
HTML rendering works as expected.<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/mozparaspancss.screen.png"/>
+ <imagedata fileref="Ref/Fig/mozparaspancss.screen.png"/>
</imageobject>
</mediaobject>:</para>
</section>
@@ -937,7 +937,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/pdfbookmarks.screen.png"/>
+ <imagedata fileref="Ref/Fig/pdfbookmarks.screen.png"/>
</imageobject>
</mediaobject>
diff --git a/Doc/Sda1/jdbc.xml b/Doc/Sda1/jdbc.xml
index 082c2b1ed53c6a8e435b96232c6ebcbbbdd3f331..f1d4927c4bd212adef33808cda612401dc8ba0a3 100644
--- a/Doc/Sda1/jdbc.xml
+++ b/Doc/Sda1/jdbc.xml
@@ -966,7 +966,7 @@ SimpleInsert.username=hdmuser</programlisting>
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/externalize.screen.png"/>
+ <imagedata fileref="Ref/Fig/externalize.screen.png"/>
</imageobject>
</mediaobject>
</informalfigure>
@@ -996,7 +996,7 @@ SimpleInsert.username=hdmuser</programlisting>
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/externalize2.screen.png"/>
+ <imagedata fileref="Ref/Fig/externalize2.screen.png"/>
</imageobject>
</mediaobject>
</informalfigure>
@@ -1128,7 +1128,7 @@ public class SimpleInsert {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/simpleInsertGui.screen.png"/>
+ <imagedata fileref="Ref/Fig/simpleInsertGui.screen.png"/>
</imageobject>
<caption>
@@ -1905,7 +1905,7 @@ public class ViewMockup implements PersistView {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/exploits_of_a_mom.png"/>
+ <imagedata fileref="Ref/Fig/exploits_of_a_mom.png"/>
</imageobject>
</mediaobject>
@@ -1990,7 +1990,7 @@ public class ViewMockup implements PersistView {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/sqlInject.screen.png"/>
+ <imagedata fileref="Ref/Fig/sqlInject.screen.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -2344,7 +2344,7 @@ public class RegexpPrimer {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/insertValidate.screen.png"/>
+ <imagedata fileref="Ref/Fig/insertValidate.screen.png"/>
</imageobject>
<caption>
@@ -2671,7 +2671,7 @@ public class SimpleInsert {
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/sqlInjectPrepare.screen.png"/>
+ <imagedata fileref="Ref/Fig/sqlInjectPrepare.screen.png"/>
</imageobject>
</mediaobject>
</informalfigure>
@@ -3000,7 +3000,7 @@ INSERT INTO Friends VALUES (1, <emphasis role="bold">'31'</emphasis>, '1991-10-1
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/login.screen.png"
+ <imagedata fileref="Ref/Fig/login.screen.png"
scale="90"/>
</imageobject>
</mediaobject>
diff --git a/Doc/Sda1/prerequisites.xml b/Doc/Sda1/prerequisites.xml
index 52b664ec2f620e69b0bf5ad081b5b0cd64848b81..a3b81bbf7366fb87ede3c0bec0e33536495d4fcd 100644
--- a/Doc/Sda1/prerequisites.xml
+++ b/Doc/Sda1/prerequisites.xml
@@ -629,7 +629,7 @@ CREATE TABLE Flight (
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/sqldevelopAddMysqlJdbc.png"/>
+ <imagedata fileref="Ref/Fig/sqldevelopAddMysqlJdbc.png"/>
</imageobject>
</mediaobject>
@@ -639,7 +639,7 @@ CREATE TABLE Flight (
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/sqldevelopChooseMysqlpng.png"/>
+ <imagedata fileref="Ref/Fig/sqldevelopChooseMysqlpng.png"/>
</imageobject>
</mediaobject>
diff --git a/Doc/Sda1/schema.xml b/Doc/Sda1/schema.xml
index 7338d6b2307852c547920dca426f65d55966604f..c38e7afa4969bb72127ae76242e1e1a6a025c537 100644
--- a/Doc/Sda1/schema.xml
+++ b/Doc/Sda1/schema.xml
@@ -124,7 +124,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/employee.png"/>
+ <imagedata fileref="Ref/Fig/employee.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -263,7 +263,7 @@
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/mediaFormat.png"/>
+ <imagedata fileref="Ref/Fig/mediaFormat.png"/>
</imageobject>
</mediaobject>
</informalfigure>
@@ -582,7 +582,7 @@ WHERE ID=1</programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/track.png"/>
+ <imagedata fileref="Ref/Fig/track.png"/>
</imageobject>
</mediaobject>
</figure>
diff --git a/Doc/Sda1/xslt.xml b/Doc/Sda1/xslt.xml
index 424cf440ebe641eb7afecfa8695436bf55aa79b5..2543d618718ef0c60fc4526c732630d70c913de0 100644
--- a/Doc/Sda1/xslt.xml
+++ b/Doc/Sda1/xslt.xml
@@ -1722,7 +1722,7 @@ you need some </emphasis><em>time</em><emphasis role="bold">.</empha
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/eclipseOxygenSaxonEE.png"/>
+ <imagedata fileref="Ref/Fig/eclipseOxygenSaxonEE.png"/>
</imageobject>
</mediaobject>
</informalfigure>
@@ -1738,7 +1738,7 @@ you need some </emphasis><em>time</em><emphasis role="bold">.</empha
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/eclipseOxygenSaxonEnableValidation.png"/>
+ <imagedata fileref="Ref/Fig/eclipseOxygenSaxonEnableValidation.png"/>
</imageobject>
</mediaobject>
</informalfigure>
@@ -2306,7 +2306,7 @@ Jack Eve Jude <----Tolstoi----> <co
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Screen/genericXml2Html.png"/>
+ <imagedata fileref="Ref/Fig/genericXml2Html.png"/>
</imageobject>
</mediaobject>
</figure>