copy from src/main/java/nl/cwi/monetdb/merovingian/Control.java
copy to src/main/java/org/monetdb/merovingian/Control.java
--- a/src/main/java/nl/cwi/monetdb/merovingian/Control.java
+++ b/src/main/java/org/monetdb/merovingian/Control.java
@@ -6,12 +6,12 @@
  * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
  */
 
-package nl.cwi.monetdb.merovingian;
+package org.monetdb.merovingian;
 
-import nl.cwi.monetdb.mcl.net.MapiSocket;
-import nl.cwi.monetdb.mcl.io.*;
-import nl.cwi.monetdb.mcl.MCLException;
-import nl.cwi.monetdb.mcl.parser.MCLParseException;
+import org.monetdb.mcl.net.MapiSocket;
+import org.monetdb.mcl.io.*;
+import org.monetdb.mcl.MCLException;
+import org.monetdb.mcl.parser.MCLParseException;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -27,7 +27,7 @@ import java.util.Properties;
 /**
  * A Control class to perform operations on a remote merovingian
  * instance, using the TCP control protocol.
- * 
+ *
  * This class implements the protocol specific bits to perform all
  * possible actions against a merovingian server that has remote control
  * facilities enabled.
@@ -109,7 +109,7 @@ public class Control {
 
 		return(Long.toString(h));
 	}
-	
+
 	final static private String RESPONSE_OK = "OK";
 
 	private List<String> sendCommand(
@@ -133,7 +133,7 @@ public class Control {
 			throw new MerovingianException(e.getMessage());
 		} catch (AssertionError e) { // mcl panics
 			ms.close();
-			
+
 			// Try old protocol instead
 			Socket s;
 			PrintStream out;
@@ -238,8 +238,8 @@ public class Control {
 	}
 
 	public void stop(String database)
-		throws MerovingianException, IOException 
-	{   
+		throws MerovingianException, IOException
+	{
 		sendCommand(database, "stop", false);
 	}
 
@@ -342,10 +342,10 @@ public class Control {
 			throw new MerovingianException("communication error");
 		return new SabaothDB(response.get(0));
 	}
-	
+
 	/**
-	 * Test whether a specific database exists. 
-	 * 
+	 * Test whether a specific database exists.
+	 *
 	 * @param database name of database
 	 * @return true, iff database already exists.
 	 * @throws MerovingianException if performing the command failed at