diff --git a/jOOQ/src/main/java/org/jooq/Configuration.java b/jOOQ/src/main/java/org/jooq/Configuration.java
index 260d4d1e99..754216ea29 100644
--- a/jOOQ/src/main/java/org/jooq/Configuration.java
+++ b/jOOQ/src/main/java/org/jooq/Configuration.java
@@ -68,6 +68,10 @@ import org.jooq.conf.Settings;
  */
 public interface Configuration extends Serializable {
 
+    // -------------------------------------------------------------------------
+    // Getters
+    // -------------------------------------------------------------------------
+
     /**
      * Retrieve the configured dialect.
      */
@@ -174,51 +178,9 @@ public interface Configuration extends Serializable {
      */
     ExecuteListenerProvider[] executeListenerProviders();
 
-    /**
-     * Create a derived configuration from this one, without changing any
-     * properties.
-     *
-     * @return The derived configuration.
-     */
-    Configuration derive();
-
-    /**
-     * Create a derived configuration from this one, with a new dialect.
-     *
-     * @param newDialect The new dialect to be contained in the derived
-     *            configuration.
-     * @return The derived configuration.
-     */
-    Configuration derive(SQLDialect newDialect);
-
-    /**
-     * Create a derived configuration from this one, with a new connection
-     * provider.
-     *
-     * @param newConnectionProvider The new connection provider to be contained
-     *            in the derived configuration.
-     * @return The derived configuration.
-     */
-    Configuration derive(ConnectionProvider newConnectionProvider);
-
-    /**
-     * Create a derived configuration from this one, with new settings.
-     *
-     * @param newSettings The new settings to be contained in the derived
-     *            configuration.
-     * @return The derived configuration.
-     */
-    Configuration derive(Settings newSettings);
-
-    /**
-     * Create a derived configuration from this one, with a new execute listener
-     * providers.
-     *
-     * @param newExecuteListenerProviders The new execute listener providers to
-     *            be contained in the derived configuration.
-     * @return The derived configuration.
-     */
-    Configuration derive(ExecuteListenerProvider... newExecuteListenerProviders);
+    // -------------------------------------------------------------------------
+    // Setters
+    // -------------------------------------------------------------------------
 
     /**
      * Change this configuration to hold a new dialect.
@@ -268,4 +230,54 @@ public interface Configuration extends Serializable {
      */
     Configuration set(ExecuteListenerProvider... newExecuteListenerProviders);
 
+    // -------------------------------------------------------------------------
+    // Derivation methods
+    // -------------------------------------------------------------------------
+
+    /**
+     * Create a derived configuration from this one, without changing any
+     * properties.
+     *
+     * @return The derived configuration.
+     */
+    Configuration derive();
+
+    /**
+     * Create a derived configuration from this one, with a new dialect.
+     *
+     * @param newDialect The new dialect to be contained in the derived
+     *            configuration.
+     * @return The derived configuration.
+     */
+    Configuration derive(SQLDialect newDialect);
+
+    /**
+     * Create a derived configuration from this one, with a new connection
+     * provider.
+     *
+     * @param newConnectionProvider The new connection provider to be contained
+     *            in the derived configuration.
+     * @return The derived configuration.
+     */
+    Configuration derive(ConnectionProvider newConnectionProvider);
+
+    /**
+     * Create a derived configuration from this one, with new settings.
+     *
+     * @param newSettings The new settings to be contained in the derived
+     *            configuration.
+     * @return The derived configuration.
+     */
+    Configuration derive(Settings newSettings);
+
+    /**
+     * Create a derived configuration from this one, with a new execute listener
+     * providers.
+     *
+     * @param newExecuteListenerProviders The new execute listener providers to
+     *            be contained in the derived configuration.
+     * @return The derived configuration.
+     */
+    Configuration derive(ExecuteListenerProvider... newExecuteListenerProviders);
+
 }