diff --git a/jOOQ-website/manual-pdf/jOOQ-manual.fo.xml b/jOOQ-website/manual-pdf/jOOQ-manual.fo.xml
index 5a4cd28e4e..70d628efde 100644
--- a/jOOQ-website/manual-pdf/jOOQ-manual.fo.xml
+++ b/jOOQ-website/manual-pdf/jOOQ-manual.fo.xml
@@ -1760,8 +1760,8 @@ Result<Record> result = create.select()
 							<fo:block font-size="11pt">
 								In the above example, some generated artefacts are used for querying.
 								In this case, T_AUTHOR and T_BOOK are instances of types
-								<fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" external-destination="url('http://www.jooq.org/javadoc/latest/org/jooq/test/oracle/generatedclasses/tables/TAuthor.html')">TAuthor</fo:basic-link> and
-								<fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" external-destination="url('http://www.jooq.org/javadoc/latest/org/jooq/test/oracle/generatedclasses/tables/TBook.html')">TBook</fo:basic-link> respectively.
+								<fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" external-destination="url('http://www.jooq.org/javadoc/latest/org/jooq/test/oracle/generatedclasses/test/tables/TAuthor.html')">TAuthor</fo:basic-link> and
+								<fo:basic-link font-size="11pt" color="#882222" font-weight="bold" text-shadow="0 1px 2px #666666" external-destination="url('http://www.jooq.org/javadoc/latest/org/jooq/test/oracle/generatedclasses/test/tables/TBook.html')">TBook</fo:basic-link> respectively.
 								Their full qualification would read TAuthor.T_AUTHOR and TBook.T_BOOK, but in many cases,
 								it's useful to static import elements involved with queries, in order to decrease verbosity:
 								<fo:block font-family="Courier" linefeed-treatment="preserve" white-space-collapse="false" white-space-treatment="preserve" font-size="6pt" margin="12pt" padding="4pt" border="2px solid #882222" background-color="#FFEEDD" page-break-inside="avoid">import static com.example.jooq.Tables.*;</fo:block>
diff --git a/jOOQ-website/manual-pdf/jOOQ-manual.pdf b/jOOQ-website/manual-pdf/jOOQ-manual.pdf
index 466d402b9c..73fff01da8 100644
Binary files a/jOOQ-website/manual-pdf/jOOQ-manual.pdf and b/jOOQ-website/manual-pdf/jOOQ-manual.pdf differ
diff --git a/jOOQ-website/manual-single-page/index.php b/jOOQ-website/manual-single-page/index.php
index ab3c321432..1b281841fa 100644
--- a/jOOQ-website/manual-single-page/index.php
+++ b/jOOQ-website/manual-single-page/index.php
@@ -855,8 +855,8 @@ Result&lt;Record&gt; result = create.select()
 							<p>
 								In the above example, some generated artefacts are used for querying.
 								In this case, T_AUTHOR and T_BOOK are instances of types
-								<a href="https://github.com/lukaseder/jOOQ/blob/master/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/tables/TAuthor.java" title="Internal API reference: org.jooq.test.oracle.generatedclasses.tables.TAuthor">TAuthor</a> and
-								<a href="https://github.com/lukaseder/jOOQ/blob/master/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/tables/TBook.java" title="Internal API reference: org.jooq.test.oracle.generatedclasses.tables.TBook">TBook</a> respectively.
+								<a href="https://github.com/jOOQ/jOOQ/blob/master/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/TAuthor.java" title="Internal API reference: org.jooq.test.oracle.generatedclasses.test.tables.TAuthor">TAuthor</a> and
+								<a href="https://github.com/jOOQ/jOOQ/blob/master/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/TBook.java" title="Internal API reference: org.jooq.test.oracle.generatedclasses.test.tables.TBook">TBook</a> respectively.
 								Their full qualification would read TAuthor.T_AUTHOR and TBook.T_BOOK, but in many cases,
 								it's useful to static import elements involved with queries, in order to decrease verbosity:
 								<pre class="prettyprint lang-java">import static com.example.jooq.Tables.*;</pre>
@@ -4861,7 +4861,7 @@ for (ExecuteType type : ExecuteType.values()) {
 
 							<p>
 								Both modes will require that you set the
-								<a href="https://github.com/lukaseder/jOOQ/blob/master/jOOQ-console/src/org/jooq/debug/DebugListener.java" title="Internal API reference: org.jooq.debug.DebugListener">org.jooq.debug.DebugListener</a>
+								<a href="https://github.com/jOOQ/jOOQ/blob/master/jOOQ-console/src/main/java/org/jooq/debug/DebugListener.java" title="Internal API reference: org.jooq.debug.DebugListener">org.jooq.debug.DebugListener</a>
 								in the Factory's settings. When using XML settings:
 							</p>
 
diff --git a/jOOQ-website/manual/ADVANCED/ExecuteListener/index.php b/jOOQ-website/manual/ADVANCED/ExecuteListener/index.php
index 49a843953a..a2e0799b87 100644
--- a/jOOQ-website/manual/ADVANCED/ExecuteListener/index.php
+++ b/jOOQ-website/manual/ADVANCED/ExecuteListener/index.php
@@ -146,7 +146,7 @@ for (ExecuteType type : ExecuteType.values()) {
 
 							<p>
 								Both modes will require that you set the
-								<a href="https://github.com/lukaseder/jOOQ/blob/master/jOOQ-console/src/org/jooq/debug/DebugListener.java" title="Internal API reference: org.jooq.debug.DebugListener">org.jooq.debug.DebugListener</a>
+								<a href="https://github.com/jOOQ/jOOQ/blob/master/jOOQ-console/src/main/java/org/jooq/debug/DebugListener.java" title="Internal API reference: org.jooq.debug.DebugListener">org.jooq.debug.DebugListener</a>
 								in the Factory's settings. When using XML settings:
 							</p>
 
diff --git a/jOOQ-website/manual/JOOQ/Query/index.php b/jOOQ-website/manual/JOOQ/Query/index.php
index c155cd5984..991c1804ef 100644
--- a/jOOQ-website/manual/JOOQ/Query/index.php
+++ b/jOOQ-website/manual/JOOQ/Query/index.php
@@ -114,8 +114,8 @@ Result&lt;Record&gt; result = create.select()
 							<p>
 								In the above example, some generated artefacts are used for querying.
 								In this case, T_AUTHOR and T_BOOK are instances of types
-								<a href="https://github.com/lukaseder/jOOQ/blob/master/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/tables/TAuthor.java" title="Internal API reference: org.jooq.test.oracle.generatedclasses.tables.TAuthor">TAuthor</a> and
-								<a href="https://github.com/lukaseder/jOOQ/blob/master/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/tables/TBook.java" title="Internal API reference: org.jooq.test.oracle.generatedclasses.tables.TBook">TBook</a> respectively.
+								<a href="https://github.com/jOOQ/jOOQ/blob/master/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/TAuthor.java" title="Internal API reference: org.jooq.test.oracle.generatedclasses.test.tables.TAuthor">TAuthor</a> and
+								<a href="https://github.com/jOOQ/jOOQ/blob/master/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/TBook.java" title="Internal API reference: org.jooq.test.oracle.generatedclasses.test.tables.TBook">TBook</a> respectively.
 								Their full qualification would read TAuthor.T_AUTHOR and TBook.T_BOOK, but in many cases,
 								it's useful to static import elements involved with queries, in order to decrease verbosity:
 								<pre class="prettyprint lang-java">import static com.example.jooq.Tables.*;</pre>
diff --git a/jOOQ-website/src/main/resources/html-util.xsl b/jOOQ-website/src/main/resources/html-util.xsl
index d47a144d7a..0e68aeeb2d 100644
--- a/jOOQ-website/src/main/resources/html-util.xsl
+++ b/jOOQ-website/src/main/resources/html-util.xsl
@@ -54,14 +54,14 @@
 							</xsl:when>
 
 							<xsl:when test="@class and starts-with(@class, 'org.jooq.test')">
-								<xsl:text>https://github.com/lukaseder/jOOQ/blob/master/jOOQ-test/src/</xsl:text>
+								<xsl:text>https://github.com/jOOQ/jOOQ/blob/master/jOOQ-test/src/</xsl:text>
 								<xsl:value-of select="translate(@class, '.', '/')"/>
 								<xsl:text>.java</xsl:text>
 								<xsl:value-of select="@anchor"/>
 							</xsl:when>
 
 							<xsl:when test="@class and starts-with(@class, 'org.jooq.debug')">
-								<xsl:text>https://github.com/lukaseder/jOOQ/blob/master/jOOQ-console/src/</xsl:text>
+								<xsl:text>https://github.com/jOOQ/jOOQ/blob/master/jOOQ-console/src/main/java/</xsl:text>
 								<xsl:value-of select="translate(@class, '.', '/')"/>
 								<xsl:text>.java</xsl:text>
 								<xsl:value-of select="@anchor"/>
diff --git a/jOOQ-website/src/main/resources/manual.xml b/jOOQ-website/src/main/resources/manual.xml
index 6f868951a8..31bdb70d1a 100644
--- a/jOOQ-website/src/main/resources/manual.xml
+++ b/jOOQ-website/src/main/resources/manual.xml
@@ -649,8 +649,8 @@ Result&lt;Record&gt; result = create.select()
 							<p>
 								In the above example, some generated artefacts are used for querying.
 								In this case, T_AUTHOR and T_BOOK are instances of types
-								<reference class="org.jooq.test.oracle.generatedclasses.tables.TAuthor" title="TAuthor"/> and
-								<reference class="org.jooq.test.oracle.generatedclasses.tables.TBook" title="TBook"/> respectively.
+								<reference class="org.jooq.test.oracle.generatedclasses.test.tables.TAuthor" title="TAuthor"/> and
+								<reference class="org.jooq.test.oracle.generatedclasses.test.tables.TBook" title="TBook"/> respectively.
 								Their full qualification would read TAuthor.T_AUTHOR and TBook.T_BOOK, but in many cases,
 								it's useful to static import elements involved with queries, in order to decrease verbosity:
 								<java>import static com.example.jooq.Tables.*;</java>
diff --git a/jOOQ-website/src/main/resources/pdf.xsl b/jOOQ-website/src/main/resources/pdf.xsl
index 123adf691f..2ceadeb5bb 100644
--- a/jOOQ-website/src/main/resources/pdf.xsl
+++ b/jOOQ-website/src/main/resources/pdf.xsl
@@ -291,7 +291,7 @@
 		<fo:basic-link xsl:use-attribute-sets="a">
 			<xsl:attribute name="external-destination">
 				<xsl:text>url('</xsl:text>
-				<xsl:text>https://github.com/lukaseder/jOOQ/blob/master/jOOQ-test/src/</xsl:text>
+				<xsl:text>https://github.com/jOOQ/jOOQ/blob/master/jOOQ-test/src/</xsl:text>
 				<xsl:value-of select="translate(@class, '.', '/')"/>
 				<xsl:text>.java</xsl:text>
 				<xsl:value-of select="@anchor"/>
@@ -306,7 +306,7 @@
 		<fo:basic-link xsl:use-attribute-sets="a">
 			<xsl:attribute name="external-destination">
 				<xsl:text>url('</xsl:text>
-				<xsl:text>https://github.com/lukaseder/jOOQ/blob/master/jOOQ-console/src/</xsl:text>
+				<xsl:text>https://github.com/jOOQ/jOOQ/blob/master/jOOQ-console/src/main/java/</xsl:text>
 				<xsl:value-of select="translate(@class, '.', '/')"/>
 				<xsl:text>.java</xsl:text>
 				<xsl:value-of select="@anchor"/>