diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java
index 80abeb0909..24152abb2f 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java
@@ -84,7 +84,7 @@ public final class Constants {
     /**
      * The current jooq-runtime XSD classpath location.
      */
-    public static final String CP_RUNTIME     = "/xsd/" + XSD_RUNTIME;
+    public static final String CP_RUNTIME     = "/org/jooq/xsd/" + XSD_RUNTIME;
 
     /**
      * The current jooq-export XSD file name.
@@ -99,7 +99,7 @@ public final class Constants {
     /**
      * The current jooq-export XSD classpath location.
      */
-    public static final String CP_EXPORT      = "/xsd/" + XSD_EXPORT;
+    public static final String CP_EXPORT      = "/org/jooq/xsd/" + XSD_EXPORT;
 
     /**
      * The current jooq-meta XSD file name.
@@ -114,7 +114,7 @@ public final class Constants {
     /**
      * The current jooq-meta XSD classpath location.
      */
-    public static final String CP_META        = "/xsd/" + XSD_META;
+    public static final String CP_META        = "/org/jooq/xsd/" + XSD_META;
 
     /**
      * The current jooq-migrations XSD file name.
@@ -129,7 +129,7 @@ public final class Constants {
     /**
      * The current jooq-migrations XSD classpath location.
      */
-    public static final String CP_MIGRATIONS  = "/xsd/" + XSD_META;
+    public static final String CP_MIGRATIONS  = "/org/jooq/xsd/" + XSD_META;
 
     /**
      * The current jooq-codegen XSD file name.
@@ -144,7 +144,7 @@ public final class Constants {
     /**
      * The current jooq-codegen XSD classpath location.
      */
-    public static final String CP_CODEGEN     = "/xsd/" + XSD_CODEGEN;
+    public static final String CP_CODEGEN     = "/org/jooq/meta/xsd/" + XSD_CODEGEN;
 
 
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java b/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java
index 0afc8c7a04..4353151604 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java
@@ -84,7 +84,7 @@ public final class Constants {
     /**
      * The current jooq-runtime XSD classpath location.
      */
-    public static final String CP_RUNTIME     = "/xsd/" + XSD_RUNTIME;
+    public static final String CP_RUNTIME     = "/org/jooq/xsd/" + XSD_RUNTIME;
 
     /**
      * The current jooq-export XSD file name.
@@ -99,7 +99,7 @@ public final class Constants {
     /**
      * The current jooq-export XSD classpath location.
      */
-    public static final String CP_EXPORT      = "/xsd/" + XSD_EXPORT;
+    public static final String CP_EXPORT      = "/org/jooq/xsd/" + XSD_EXPORT;
 
     /**
      * The current jooq-meta XSD file name.
@@ -114,7 +114,7 @@ public final class Constants {
     /**
      * The current jooq-meta XSD classpath location.
      */
-    public static final String CP_META        = "/xsd/" + XSD_META;
+    public static final String CP_META        = "/org/jooq/xsd/" + XSD_META;
 
     /**
      * The current jooq-migrations XSD file name.
@@ -129,7 +129,7 @@ public final class Constants {
     /**
      * The current jooq-migrations XSD classpath location.
      */
-    public static final String CP_MIGRATIONS  = "/xsd/" + XSD_META;
+    public static final String CP_MIGRATIONS  = "/org/jooq/xsd/" + XSD_META;
 
     /**
      * The current jooq-codegen XSD file name.
@@ -144,7 +144,7 @@ public final class Constants {
     /**
      * The current jooq-codegen XSD classpath location.
      */
-    public static final String CP_CODEGEN     = "/xsd/" + XSD_CODEGEN;
+    public static final String CP_CODEGEN     = "/org/jooq/meta/xsd/" + XSD_CODEGEN;