diff --git a/jOOQ-oss/.gitignore b/jOOQ-oss/.gitignore
new file mode 100644
index 0000000..dd53bfa
--- /dev/null
+++ b/jOOQ-oss/.gitignore
@@ -0,0 +1,3 @@
+*.iml
+/.idea/
+/target
diff --git a/jOOQ-pro/.gitignore b/jOOQ-pro/.gitignore
new file mode 100644
index 0000000..dd53bfa
--- /dev/null
+++ b/jOOQ-pro/.gitignore
@@ -0,0 +1,3 @@
+*.iml
+/.idea/
+/target
diff --git a/pom.xml b/jOOQ-pro/pom.xml
similarity index 100%
rename from pom.xml
rename to jOOQ-pro/pom.xml
diff --git a/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/DefaultCatalog.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java
diff --git a/src/main/java/org/jooq/demo/java/db/Indexes.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/Indexes.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/Indexes.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/Indexes.java
diff --git a/src/main/java/org/jooq/demo/java/db/Keys.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/Keys.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/Keys.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/Keys.java
diff --git a/src/main/java/org/jooq/demo/java/db/Public.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/Public.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/Public.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/Public.java
diff --git a/src/main/java/org/jooq/demo/java/db/Sequences.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/Sequences.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/Sequences.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/Sequences.java
diff --git a/src/main/java/org/jooq/demo/java/db/Tables.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/Tables.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/Tables.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/Tables.java
diff --git a/src/main/java/org/jooq/demo/java/db/enums/MpaaRating.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/enums/MpaaRating.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/enums/MpaaRating.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/enums/MpaaRating.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Actor.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Actor.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Actor.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Actor.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Address.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Address.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Address.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Address.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Category.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Category.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Category.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Category.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/City.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/City.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/City.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/City.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Country.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Country.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Country.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Country.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Customer.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Customer.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Customer.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Customer.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/CustomerList.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Film.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Film.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Film.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Film.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/FilmActor.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Inventory.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Inventory.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Inventory.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Inventory.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Language.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Language.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Language.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Language.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Payment.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Payment.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Payment.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Payment.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Rental.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Rental.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Rental.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Rental.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Staff.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Staff.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Staff.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Staff.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/StaffList.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/StaffList.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/StaffList.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/StaffList.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/Store.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Store.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/Store.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/Store.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/ActorDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/ActorDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/ActorDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/ActorDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/AddressDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/AddressDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/AddressDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/AddressDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/CategoryDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/CategoryDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/CategoryDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/CategoryDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/CityDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/CityDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/CityDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/CityDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/CountryDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/CountryDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/CountryDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/CountryDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/CustomerDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/CustomerDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/CustomerDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/CustomerDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/FilmActorDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/FilmActorDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/FilmActorDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/FilmActorDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/FilmCategoryDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/FilmCategoryDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/FilmCategoryDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/FilmCategoryDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/FilmDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/FilmDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/FilmDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/FilmDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/InventoryDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/InventoryDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/InventoryDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/InventoryDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/LanguageDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/LanguageDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/LanguageDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/LanguageDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/PaymentDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/PaymentDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/PaymentDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/PaymentDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/RentalDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/RentalDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/RentalDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/RentalDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/StaffDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/StaffDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/StaffDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/StaffDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/daos/StoreDao.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/StoreDao.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/daos/StoreDao.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/daos/StoreDao.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/City.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/ActorRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/ActorRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/ActorRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/ActorRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/AddressRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/AddressRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/AddressRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/AddressRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/CategoryRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/CategoryRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/CategoryRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/CategoryRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/CityRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/CityRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/CityRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/CityRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/CountryRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/CountryRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/CountryRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/CountryRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/CustomerListRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/CustomerListRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/CustomerListRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/CustomerListRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/CustomerRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/CustomerRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/CustomerRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/CustomerRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/FilmActorRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/FilmActorRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/FilmActorRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/FilmActorRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/FilmCategoryRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/FilmCategoryRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/FilmCategoryRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/FilmCategoryRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/FilmRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/FilmRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/FilmRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/FilmRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/InventoryRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/InventoryRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/InventoryRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/InventoryRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/LanguageRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/LanguageRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/LanguageRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/LanguageRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/PaymentRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/PaymentRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/PaymentRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/PaymentRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/RentalRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/RentalRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/RentalRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/RentalRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/SalesByFilmCategoryRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/SalesByFilmCategoryRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/SalesByFilmCategoryRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/SalesByFilmCategoryRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/SalesByStoreRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/SalesByStoreRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/SalesByStoreRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/SalesByStoreRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/StaffListRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/StaffListRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/StaffListRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/StaffListRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/StaffRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/StaffRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/StaffRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/StaffRecord.java
diff --git a/src/main/java/org/jooq/demo/java/db/tables/records/StoreRecord.java b/jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/StoreRecord.java
similarity index 100%
rename from src/main/java/org/jooq/demo/java/db/tables/records/StoreRecord.java
rename to jOOQ-pro/src/main/java/org/jooq/demo/java/db/tables/records/StoreRecord.java
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/Public.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/Public.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/Public.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/Public.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/enums/MpaaRating.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/enums/MpaaRating.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/enums/MpaaRating.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/enums/MpaaRating.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/indexes/Indexes.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/indexes/Indexes.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/indexes/Indexes.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/indexes/Indexes.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/keys/Keys.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/keys/Keys.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/keys/Keys.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/keys/Keys.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/sequences/Sequences.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/sequences/Sequences.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/sequences/Sequences.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/sequences/Sequences.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/ActorDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/ActorDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/ActorDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/ActorDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/AddressDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/AddressDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/AddressDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/AddressDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CategoryDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CategoryDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CategoryDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CategoryDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CityDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CityDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CityDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CityDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CountryDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CountryDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CountryDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CountryDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CustomerDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CustomerDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CustomerDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/CustomerDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmActorDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmActorDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmActorDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmActorDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmCategoryDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmCategoryDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmCategoryDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmCategoryDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/FilmDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/InventoryDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/InventoryDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/InventoryDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/InventoryDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/LanguageDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/LanguageDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/LanguageDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/LanguageDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/PaymentDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/PaymentDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/PaymentDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/PaymentDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/RentalDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/RentalDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/RentalDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/RentalDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/StaffDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/StaffDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/StaffDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/StaffDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/StoreDao.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/StoreDao.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/StoreDao.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/daos/StoreDao.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Actor.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Actor.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Actor.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Actor.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Address.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Address.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Address.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Address.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Category.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Category.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Category.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Category.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/City.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/City.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/City.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/City.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Country.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Country.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Country.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Country.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Customer.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Customer.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Customer.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Customer.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/CustomerList.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/CustomerList.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/CustomerList.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/CustomerList.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Film.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Film.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Film.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Film.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/FilmActor.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/FilmActor.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/FilmActor.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/FilmActor.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/FilmCategory.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/FilmCategory.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/FilmCategory.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/FilmCategory.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Inventory.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Inventory.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Inventory.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Inventory.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Language.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Language.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Language.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Language.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Payment.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Payment.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Payment.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Payment.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Rental.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Rental.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Rental.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Rental.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/SalesByFilmCategory.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/SalesByFilmCategory.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/SalesByFilmCategory.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/SalesByFilmCategory.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/SalesByStore.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/SalesByStore.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/SalesByStore.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/SalesByStore.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Staff.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Staff.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Staff.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Staff.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/StaffList.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/StaffList.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/StaffList.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/StaffList.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Store.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Store.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Store.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/pojos/Store.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt
diff --git a/src/main/kotlin/org/jooq/demo/kotlin/db/tables/references/Tables.kt b/jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/references/Tables.kt
similarity index 100%
rename from src/main/kotlin/org/jooq/demo/kotlin/db/tables/references/Tables.kt
rename to jOOQ-pro/src/main/kotlin/org/jooq/demo/kotlin/db/tables/references/Tables.kt
diff --git a/src/main/resources/config.properties b/jOOQ-pro/src/main/resources/config.properties
similarity index 100%
rename from src/main/resources/config.properties
rename to jOOQ-pro/src/main/resources/config.properties
diff --git a/src/main/resources/log4j2.xml b/jOOQ-pro/src/main/resources/log4j2.xml
similarity index 100%
rename from src/main/resources/log4j2.xml
rename to jOOQ-pro/src/main/resources/log4j2.xml
diff --git a/src/test/java/org/jooq/demo/AbstractDemo.java b/jOOQ-pro/src/test/java/org/jooq/demo/AbstractDemo.java
similarity index 80%
rename from src/test/java/org/jooq/demo/AbstractDemo.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/AbstractDemo.java
index 8ac7d22..5fc9091 100644
--- a/src/test/java/org/jooq/demo/AbstractDemo.java
+++ b/jOOQ-pro/src/test/java/org/jooq/demo/AbstractDemo.java
@@ -1,6 +1,7 @@
 package org.jooq.demo;
 
 import org.jooq.DSLContext;
+import org.jooq.ExecuteListener;
 import org.jooq.SQLDialect;
 import org.jooq.conf.Settings;
 import org.jooq.impl.DefaultConfiguration;
@@ -12,7 +13,9 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
+import java.util.stream.Stream;
 
+import static org.jooq.SQLDialect.*;
 import static org.jooq.demo.java.db.Tables.ACTOR;
 import static org.jooq.impl.DSL.using;
 
@@ -41,17 +44,17 @@ public void setup() throws IOException, SQLException {
                 .set(connection)
                 .set(SQLDialect.COCKROACHDB)
                 .set(new Settings()
-//                .withRenderFormatted(true)
+                .withRenderFormatted(true)
                 )
 
             // Activate this to get the output from different dialects
-//            .set(ExecuteListener.onExecuteStart(e -> Stream
-//                .of(MYSQL, ORACLE, POSTGRES, SQLSERVER)
-//                .map(d -> using(d, new Settings().withRenderFormatted(true)))
-//                .forEach(c -> {
-//                    title(c.dialect());
-//                    println(c.renderInlined(e.query()));
-//                })))
+            .set(ExecuteListener.onExecuteStart(e -> Stream
+                .of(MYSQL, ORACLE, POSTGRES, SQLSERVER)
+                .map(d -> using(d, new Settings().withRenderFormatted(true)))
+                .forEach(c -> {
+                    title(c.dialect());
+                    println(c.renderInlined(e.query()));
+                })))
         );
 
         // Initialise classes
diff --git a/src/test/java/org/jooq/demo/java/Demo01Querying.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo01Querying.java
similarity index 96%
rename from src/test/java/org/jooq/demo/java/Demo01Querying.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo01Querying.java
index e16ac61..edc4b91 100644
--- a/src/test/java/org/jooq/demo/java/Demo01Querying.java
+++ b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo01Querying.java
@@ -102,7 +102,6 @@ public void typeSafetyActiveRecords() {
             .fetchSingle();
 
         println("Resulting actor: %s %s".formatted(actor.getFirstName(), actor.getLastName()));
-
         // More on these UpdatableRecords later
     }
 
@@ -188,7 +187,10 @@ public void typeSafetyAliasing() {
     @Test
     public void implicitJoins() {
         title("No need to spell out trivial to-one joins");
-        ctx.select(CUSTOMER.FIRST_NAME, CUSTOMER.LAST_NAME, CUSTOMER.address().city().country().COUNTRY_)
+        ctx.select(
+                CUSTOMER.FIRST_NAME,
+                CUSTOMER.LAST_NAME,
+                CUSTOMER.address().city().country().COUNTRY_)
             .from(CUSTOMER)
             .orderBy(1, 2)
             .limit(5)
@@ -218,7 +220,10 @@ record Customer(String firstName, String lastName, Country country) {}
 
         title("Nesting is particularly useful when using ad-hoc converters");
         List<Customer> r =
-            ctx.select(CUSTOMER.FIRST_NAME, CUSTOMER.LAST_NAME, CUSTOMER.address().city().country().COUNTRY_.convertFrom(Country::new))
+            ctx.select(
+                    CUSTOMER.FIRST_NAME,
+                    CUSTOMER.LAST_NAME,
+                    CUSTOMER.address().city().country().COUNTRY_.convertFrom(Country::new))
                .from(CUSTOMER)
                .orderBy(1, 2)
                .limit(5)
@@ -250,7 +255,7 @@ record Customer(String firstName, String lastName, Country country) {}
     @Test
     public void nestingToManyRelationships() {
         title("The envy of all other ORMs: MULTISET!");
-        var r =
+        Result<Record3<String, Result<Record2<String, String>>, Result<Record1<String>>>> r =
         ctx.select(
                 FILM.TITLE,
                 multiset(
diff --git a/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java
similarity index 100%
rename from src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java
diff --git a/src/test/java/org/jooq/demo/java/Demo03Functions.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo03Functions.java
similarity index 100%
rename from src/test/java/org/jooq/demo/java/Demo03Functions.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo03Functions.java
diff --git a/src/test/java/org/jooq/demo/java/Demo04DML.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo04DML.java
similarity index 100%
rename from src/test/java/org/jooq/demo/java/Demo04DML.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo04DML.java
diff --git a/src/test/java/org/jooq/demo/java/Demo05Batch.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo05Batch.java
similarity index 100%
rename from src/test/java/org/jooq/demo/java/Demo05Batch.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo05Batch.java
diff --git a/src/test/java/org/jooq/demo/java/Demo06Transactions.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo06Transactions.java
similarity index 100%
rename from src/test/java/org/jooq/demo/java/Demo06Transactions.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo06Transactions.java
diff --git a/src/test/java/org/jooq/demo/java/Demo07Parser.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo07Parser.java
similarity index 100%
rename from src/test/java/org/jooq/demo/java/Demo07Parser.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo07Parser.java
diff --git a/src/test/java/org/jooq/demo/java/Demo08ImportExportAndMore.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo08ImportExportAndMore.java
similarity index 100%
rename from src/test/java/org/jooq/demo/java/Demo08ImportExportAndMore.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo08ImportExportAndMore.java
diff --git a/src/test/java/org/jooq/demo/java/Demo09DAOs.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo09DAOs.java
similarity index 100%
rename from src/test/java/org/jooq/demo/java/Demo09DAOs.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo09DAOs.java
diff --git a/src/test/java/org/jooq/demo/java/Demo10SPIs.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo10SPIs.java
similarity index 100%
rename from src/test/java/org/jooq/demo/java/Demo10SPIs.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo10SPIs.java
diff --git a/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java b/jOOQ-pro/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java
similarity index 100%
rename from src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java
rename to jOOQ-pro/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt
similarity index 96%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt
index 41764e2..b61c93c 100644
--- a/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt
+++ b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt
@@ -14,6 +14,7 @@ import org.jooq.kotlin.mapping
 import org.junit.Test
 import java.math.BigDecimal
 import java.time.LocalDate
+import java.time.LocalDateTime
 import java.util.function.BiConsumer
 
 class Demo01Querying : AbstractDemo() {
@@ -29,7 +30,7 @@ class Demo01Querying : AbstractDemo() {
     @Test
     fun typeSafetySimpleQuery() {
         title("A simple type safe query")
-        val r = ctx.select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME)
+        val r = ctx.select(ACTOR.FIRST_NAME, ACTOR.LAST_UPDATE)
             .from(ACTOR)
             .where(ACTOR.LAST_NAME.like("A%"))
             .orderBy(ACTOR.FIRST_NAME.asc())
@@ -102,7 +103,7 @@ class Demo01Querying : AbstractDemo() {
         val result = ctx.select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME)
             .from(ACTOR)
             .where(ACTOR.FIRST_NAME.like("A%"))
-            .union(
+            .unionAll(
                 select(CUSTOMER.FIRST_NAME, CUSTOMER.LAST_NAME)
                 .from(CUSTOMER)
                 .where(CUSTOMER.FIRST_NAME.like("A%"))
@@ -134,6 +135,7 @@ class Demo01Querying : AbstractDemo() {
     @Test
     fun standardisationLimit() {
         title("LIMIT .. OFFSET works in (almost) all dialects")
+
         val r1 = ctx.select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME)
             .from(ACTOR)
             .where(ACTOR.FIRST_NAME.like("A%"))
@@ -220,7 +222,8 @@ class Demo01Querying : AbstractDemo() {
             .select(
                 CUSTOMER.FIRST_NAME,
                 CUSTOMER.LAST_NAME,
-                CUSTOMER.address.city.country.COUNTRY_.convertFrom(::Country))
+                CUSTOMER.address.city.country.COUNTRY_.convertFrom(::Country)
+            )
             .from(CUSTOMER)
             .orderBy(1, 2)
             .limit(5)
@@ -249,13 +252,17 @@ class Demo01Querying : AbstractDemo() {
     @Test
     fun nestingToManyRelationships() {
         title("The envy of all other ORMs: MULTISET!")
-        val r = ctx
+        val r: Result<Record3<
+                String?,
+                Result<Record2<String?, LocalDateTime?>>,
+                Result<Record1<String?>>
+                >> = ctx
             .select(
                 FILM.TITLE,
                 multiset(
                     select(
                         FILM_ACTOR.actor.FIRST_NAME,
-                        FILM_ACTOR.actor.LAST_NAME
+                        FILM_ACTOR.actor.LAST_UPDATE
                     )
                     .from(FILM_ACTOR)
                     .where(FILM_ACTOR.FILM_ID.eq(FILM.FILM_ID))
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo02DynamicSQL.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo02DynamicSQL.kt
similarity index 100%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo02DynamicSQL.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo02DynamicSQL.kt
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo03Functions.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo03Functions.kt
similarity index 100%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo03Functions.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo03Functions.kt
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo04DML.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo04DML.kt
similarity index 100%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo04DML.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo04DML.kt
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo05Batch.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo05Batch.kt
similarity index 100%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo05Batch.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo05Batch.kt
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo06Transactions.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo06Transactions.kt
similarity index 100%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo06Transactions.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo06Transactions.kt
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo07Parser.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo07Parser.kt
similarity index 100%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo07Parser.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo07Parser.kt
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo08ImportExportAndMore.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo08ImportExportAndMore.kt
similarity index 100%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo08ImportExportAndMore.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo08ImportExportAndMore.kt
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo09DAOs.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo09DAOs.kt
similarity index 100%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo09DAOs.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo09DAOs.kt
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo10SPIs.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo10SPIs.kt
similarity index 100%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo10SPIs.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo10SPIs.kt
diff --git a/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt b/jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt
similarity index 100%
rename from src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt
rename to jOOQ-pro/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt