diff --git a/relational-query-HDBC-pgTest/GNUmakefile b/examples/HDBC/PostgreSQL/GNUmakefile
similarity index 100%
rename from relational-query-HDBC-pgTest/GNUmakefile
rename to examples/HDBC/PostgreSQL/GNUmakefile
diff --git a/relational-query-HDBC-pgTest/LICENSE b/examples/HDBC/PostgreSQL/LICENSE
similarity index 100%
rename from relational-query-HDBC-pgTest/LICENSE
rename to examples/HDBC/PostgreSQL/LICENSE
diff --git a/relational-query-HDBC-pgTest/Setup.hs b/examples/HDBC/PostgreSQL/Setup.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/Setup.hs
rename to examples/HDBC/PostgreSQL/Setup.hs
diff --git a/relational-query-HDBC-pgTest/example/1/Group.hs b/examples/HDBC/PostgreSQL/example/1/Group.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/1/Group.hs
rename to examples/HDBC/PostgreSQL/example/1/Group.hs
diff --git a/relational-query-HDBC-pgTest/example/1/Membership.hs b/examples/HDBC/PostgreSQL/example/1/Membership.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/1/Membership.hs
rename to examples/HDBC/PostgreSQL/example/1/Membership.hs
diff --git a/relational-query-HDBC-pgTest/example/1/QueryArrowExample.hs b/examples/HDBC/PostgreSQL/example/1/QueryArrowExample.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/1/QueryArrowExample.hs
rename to examples/HDBC/PostgreSQL/example/1/QueryArrowExample.hs
diff --git a/relational-query-HDBC-pgTest/example/1/QueryExample.hs b/examples/HDBC/PostgreSQL/example/1/QueryExample.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/1/QueryExample.hs
rename to examples/HDBC/PostgreSQL/example/1/QueryExample.hs
diff --git a/relational-query-HDBC-pgTest/example/1/User.hs b/examples/HDBC/PostgreSQL/example/1/User.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/1/User.hs
rename to examples/HDBC/PostgreSQL/example/1/User.hs
diff --git a/relational-query-HDBC-pgTest/example/1/create.sh b/examples/HDBC/PostgreSQL/example/1/create.sh
similarity index 100%
rename from relational-query-HDBC-pgTest/example/1/create.sh
rename to examples/HDBC/PostgreSQL/example/1/create.sh
diff --git a/relational-query-HDBC-pgTest/example/1/drop.sh b/examples/HDBC/PostgreSQL/example/1/drop.sh
similarity index 100%
rename from relational-query-HDBC-pgTest/example/1/drop.sh
rename to examples/HDBC/PostgreSQL/example/1/drop.sh
diff --git a/relational-query-HDBC-pgTest/example/1/run.hs b/examples/HDBC/PostgreSQL/example/1/run.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/1/run.hs
rename to examples/HDBC/PostgreSQL/example/1/run.hs
diff --git a/relational-query-HDBC-pgTest/example/1/runArrow.hs b/examples/HDBC/PostgreSQL/example/1/runArrow.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/1/runArrow.hs
rename to examples/HDBC/PostgreSQL/example/1/runArrow.hs
diff --git a/relational-query-HDBC-pgTest/example/2/KeyTest.hs b/examples/HDBC/PostgreSQL/example/2/KeyTest.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/2/KeyTest.hs
rename to examples/HDBC/PostgreSQL/example/2/KeyTest.hs
diff --git a/relational-query-HDBC-pgTest/example/2/create.sh b/examples/HDBC/PostgreSQL/example/2/create.sh
similarity index 100%
rename from relational-query-HDBC-pgTest/example/2/create.sh
rename to examples/HDBC/PostgreSQL/example/2/create.sh
diff --git a/relational-query-HDBC-pgTest/example/2/drop.sh b/examples/HDBC/PostgreSQL/example/2/drop.sh
similarity index 100%
rename from relational-query-HDBC-pgTest/example/2/drop.sh
rename to examples/HDBC/PostgreSQL/example/2/drop.sh
diff --git a/relational-query-HDBC-pgTest/example/2/show.hs b/examples/HDBC/PostgreSQL/example/2/show.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/2/show.hs
rename to examples/HDBC/PostgreSQL/example/2/show.hs
diff --git a/relational-query-HDBC-pgTest/example/3/History.hs b/examples/HDBC/PostgreSQL/example/3/History.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/3/History.hs
rename to examples/HDBC/PostgreSQL/example/3/History.hs
diff --git a/relational-query-HDBC-pgTest/example/3/SetA.hs b/examples/HDBC/PostgreSQL/example/3/SetA.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/3/SetA.hs
rename to examples/HDBC/PostgreSQL/example/3/SetA.hs
diff --git a/relational-query-HDBC-pgTest/example/3/SetB.hs b/examples/HDBC/PostgreSQL/example/3/SetB.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/3/SetB.hs
rename to examples/HDBC/PostgreSQL/example/3/SetB.hs
diff --git a/relational-query-HDBC-pgTest/example/3/create.sh b/examples/HDBC/PostgreSQL/example/3/create.sh
similarity index 100%
rename from relational-query-HDBC-pgTest/example/3/create.sh
rename to examples/HDBC/PostgreSQL/example/3/create.sh
diff --git a/relational-query-HDBC-pgTest/example/3/drop.sh b/examples/HDBC/PostgreSQL/example/3/drop.sh
similarity index 100%
rename from relational-query-HDBC-pgTest/example/3/drop.sh
rename to examples/HDBC/PostgreSQL/example/3/drop.sh
diff --git a/relational-query-HDBC-pgTest/example/3/query.hs b/examples/HDBC/PostgreSQL/example/3/query.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/3/query.hs
rename to examples/HDBC/PostgreSQL/example/3/query.hs
diff --git a/relational-query-HDBC-pgTest/example/4/One.hs b/examples/HDBC/PostgreSQL/example/4/One.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/4/One.hs
rename to examples/HDBC/PostgreSQL/example/4/One.hs
diff --git a/relational-query-HDBC-pgTest/example/4/StockGoods.hs b/examples/HDBC/PostgreSQL/example/4/StockGoods.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/4/StockGoods.hs
rename to examples/HDBC/PostgreSQL/example/4/StockGoods.hs
diff --git a/relational-query-HDBC-pgTest/example/4/create.sh b/examples/HDBC/PostgreSQL/example/4/create.sh
similarity index 100%
rename from relational-query-HDBC-pgTest/example/4/create.sh
rename to examples/HDBC/PostgreSQL/example/4/create.sh
diff --git a/relational-query-HDBC-pgTest/example/4/drop.sh b/examples/HDBC/PostgreSQL/example/4/drop.sh
similarity index 100%
rename from relational-query-HDBC-pgTest/example/4/drop.sh
rename to examples/HDBC/PostgreSQL/example/4/drop.sh
diff --git a/relational-query-HDBC-pgTest/example/4/modifyExample.hs b/examples/HDBC/PostgreSQL/example/4/modifyExample.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/4/modifyExample.hs
rename to examples/HDBC/PostgreSQL/example/4/modifyExample.hs
diff --git a/relational-query-HDBC-pgTest/example/PgTestDataSource.hs b/examples/HDBC/PostgreSQL/example/PgTestDataSource.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/example/PgTestDataSource.hs
rename to examples/HDBC/PostgreSQL/example/PgTestDataSource.hs
diff --git a/relational-query-HDBC-pgTest/example/README b/examples/HDBC/PostgreSQL/example/README
similarity index 100%
rename from relational-query-HDBC-pgTest/example/README
rename to examples/HDBC/PostgreSQL/example/README
diff --git a/relational-query-HDBC-pgTest/pgTest/pgTest.hs b/examples/HDBC/PostgreSQL/pgTest/pgTest.hs
similarity index 100%
rename from relational-query-HDBC-pgTest/pgTest/pgTest.hs
rename to examples/HDBC/PostgreSQL/pgTest/pgTest.hs
diff --git a/relational-query-HDBC-pgTest/relational-query-HDBC-pgTest.cabal b/examples/HDBC/PostgreSQL/relational-query-HDBC-pgTest.cabal
similarity index 100%
rename from relational-query-HDBC-pgTest/relational-query-HDBC-pgTest.cabal
rename to examples/HDBC/PostgreSQL/relational-query-HDBC-pgTest.cabal