copy from src/main/java/nl/cwi/monetdb/client/JdbcClient.java
copy to src/main/java/org/monetdb/client/JdbcClient.java
--- a/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
+++ b/src/main/java/org/monetdb/client/JdbcClient.java
@@ -6,14 +6,14 @@
  * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
  */
 
-package nl.cwi.monetdb.client;
+package org.monetdb.client;
 
-import nl.cwi.monetdb.util.CmdLineOpts;
-import nl.cwi.monetdb.util.Exporter;
-import nl.cwi.monetdb.util.MDBvalidator;
-import nl.cwi.monetdb.util.OptionsException;
-import nl.cwi.monetdb.util.SQLExporter;
-import nl.cwi.monetdb.util.XMLExporter;
+import org.monetdb.util.CmdLineOpts;
+import org.monetdb.util.Exporter;
+import org.monetdb.util.MDBvalidator;
+import org.monetdb.util.OptionsException;
+import org.monetdb.util.SQLExporter;
+import org.monetdb.util.XMLExporter;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -25,7 +25,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;	// import is required as it will load the nl.cwi.monetdb.jdbc.MonetDriver class
+import java.sql.DriverManager;	// this import is required as it will trigger loading the org.monetdb.jdbc.MonetDriver class
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.Statement;
@@ -48,7 +48,7 @@ import java.util.List;
  * @version 1.6
  */
 
-public final class JdbcClient {
+public class JdbcClient {	/* cannot (yet) be final as nl.cwi.monetdb.client.JdbcClient extends this class */
 
 	private static Connection con;
 	private static DatabaseMetaData dbmd;
@@ -246,7 +246,7 @@ public final class JdbcClient {
 			// We cannot use the DatabaseMetaData here, because we
 			// cannot get a Connection.  So instead, we just get the
 			// values we want out of the Driver directly.
-			System.out.println("JDBC Driver: v" + nl.cwi.monetdb.jdbc.MonetDriver.getDriverVersion());
+			System.out.println("JDBC Driver: v" + org.monetdb.jdbc.MonetDriver.getDriverVersion());
 			System.exit(0);
 		}
 
@@ -275,7 +275,7 @@ public final class JdbcClient {
 		}
 
 		// make sure the driver is loaded
-		// Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");	// not needed anymore for self registering JDBC drivers
+		// Class.forName("org.monetdb.jdbc.MonetDriver");	// not needed anymore for self registering JDBC drivers
 
 		// build the extra arguments of the JDBC connect string
 		String attr = "?";
@@ -690,8 +690,8 @@ public final class JdbcClient {
 						out.println("\\l<uri>  executes the contents of the given file or URL");
 						out.println("\\i<uri>  batch executes the inserts from the given file or URL");
 						out.println("\\vsci    validate sql system catalog integrity");
-					//	out.println("\\vsni    validate sql system netcdf tables integrity");	// depends on availability of netcdf library on server
-					//	out.println("\\vsgi    validate sql system geom tables integrity");	// depends on availability of geom library on server
+					//	out.println("\\vsni    validate sql system netcdf tables integrity");	// do not list as it depends on availability of netcdf library on server
+					//	out.println("\\vsgi    validate sql system geom tables integrity");	// do not list as it depends on availability of geom library on server
 						out.println("\\vsi <schema>  validate integrity of data in the given schema");
 						out.println("\\vdbi    validate integrity of data in all user schemas in the database");
 						out.println("\\? or \\h this help screen");