diff --git a/src/fr/devinsy/util/cmdexec/CmdExec.java b/src/fr/devinsy/cmdexec/CmdExec.java
similarity index 98%
rename from src/fr/devinsy/util/cmdexec/CmdExec.java
rename to src/fr/devinsy/cmdexec/CmdExec.java
index b412003..fef3e50 100644
--- a/src/fr/devinsy/util/cmdexec/CmdExec.java
+++ b/src/fr/devinsy/cmdexec/CmdExec.java
@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-cmdexec.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.cmdexec;
+package fr.devinsy.cmdexec;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import fr.devinsy.cmdexec.StreamGobbler.StreamWay;
+import fr.devinsy.cmdexec.util.CommandSplitter;
 import fr.devinsy.strings.StringsUtils;
-import fr.devinsy.util.cmdexec.StreamGobbler.StreamWay;
-import fr.devinsy.util.cmdexec.util.CommandSplitter;
 
 /**
  * The Class CmdExec.
diff --git a/src/fr/devinsy/util/cmdexec/CmdExecException.java b/src/fr/devinsy/cmdexec/CmdExecException.java
similarity index 95%
rename from src/fr/devinsy/util/cmdexec/CmdExecException.java
rename to src/fr/devinsy/cmdexec/CmdExecException.java
index 0a2e1fb..fff60de 100644
--- a/src/fr/devinsy/util/cmdexec/CmdExecException.java
+++ b/src/fr/devinsy/cmdexec/CmdExecException.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2016-2017 Christian Pierre MOMON
+ *  Copyright (C) 2016-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-cmdexec.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-cmdexec.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.cmdexec;
+package fr.devinsy.cmdexec;
 
 /**
  * The Class CmdExecException.
diff --git a/src/fr/devinsy/util/cmdexec/CmdExecUtils.java b/src/fr/devinsy/cmdexec/CmdExecUtils.java
similarity index 98%
rename from src/fr/devinsy/util/cmdexec/CmdExecUtils.java
rename to src/fr/devinsy/cmdexec/CmdExecUtils.java
index 5168a5c..8b696cf 100644
--- a/src/fr/devinsy/util/cmdexec/CmdExecUtils.java
+++ b/src/fr/devinsy/cmdexec/CmdExecUtils.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-cmdexec.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.cmdexec;
+package fr.devinsy.cmdexec;
 
 import java.util.ArrayList;
 
@@ -24,8 +24,8 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import fr.devinsy.cmdexec.util.CommandSplitter;
 import fr.devinsy.strings.StringsUtils;
-import fr.devinsy.util.cmdexec.util.CommandSplitter;
 
 /**
  * The Class CmdExecUtils
diff --git a/src/fr/devinsy/util/cmdexec/StreamGobbler.java b/src/fr/devinsy/cmdexec/StreamGobbler.java
similarity index 97%
rename from src/fr/devinsy/util/cmdexec/StreamGobbler.java
rename to src/fr/devinsy/cmdexec/StreamGobbler.java
index 6eed29c..0183c6d 100644
--- a/src/fr/devinsy/util/cmdexec/StreamGobbler.java
+++ b/src/fr/devinsy/cmdexec/StreamGobbler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008,2010,2013,2016-2017 Christian Pierre MOMON
+ * Copyright (C) 2005-2008,2010,2013,2016-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-cmdexec.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-cmdexec.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.cmdexec;
+package fr.devinsy.cmdexec;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -152,7 +152,9 @@ public class StreamGobbler extends Thread
 		return result;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see java.lang.Thread#run()
 	 */
 	@Override
diff --git a/src/fr/devinsy/util/cmdexec/demo/CmdExecDemo.java b/src/fr/devinsy/cmdexec/demo/CmdExecDemo.java
similarity index 94%
rename from src/fr/devinsy/util/cmdexec/demo/CmdExecDemo.java
rename to src/fr/devinsy/cmdexec/demo/CmdExecDemo.java
index b536faa..936a58f 100644
--- a/src/fr/devinsy/util/cmdexec/demo/CmdExecDemo.java
+++ b/src/fr/devinsy/cmdexec/demo/CmdExecDemo.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-cmdexec.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.cmdexec.demo;
+package fr.devinsy.cmdexec.demo;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,10 +26,10 @@ import org.apache.log4j.Level;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fr.devinsy.util.cmdexec.CmdExec;
-import fr.devinsy.util.cmdexec.CmdExecException;
-import fr.devinsy.util.cmdexec.CmdExecUtils;
-import fr.devinsy.util.cmdexec.StreamGobbler;
+import fr.devinsy.cmdexec.CmdExec;
+import fr.devinsy.cmdexec.CmdExecException;
+import fr.devinsy.cmdexec.CmdExecUtils;
+import fr.devinsy.cmdexec.StreamGobbler;
 
 /**
  * The Class Demo.
diff --git a/src/fr/devinsy/util/cmdexec/util/CommandSplitter.java b/src/fr/devinsy/cmdexec/util/CommandSplitter.java
similarity index 97%
rename from src/fr/devinsy/util/cmdexec/util/CommandSplitter.java
rename to src/fr/devinsy/cmdexec/util/CommandSplitter.java
index acc16aa..57d945d 100644
--- a/src/fr/devinsy/util/cmdexec/util/CommandSplitter.java
+++ b/src/fr/devinsy/cmdexec/util/CommandSplitter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2005-2010,2013,2015-2017 Christian Pierre MOMON
+ *  Copyright (C) 2005-2010,2013,2015-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-cmdexec.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-cmdexec.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.cmdexec.util;
+package fr.devinsy.cmdexec.util;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
diff --git a/test/fr/devinsy/util/cmdexec/CmdExecSandbox.java b/test/fr/devinsy/cmdexec/CmdExecSandbox.java
similarity index 97%
rename from test/fr/devinsy/util/cmdexec/CmdExecSandbox.java
rename to test/fr/devinsy/cmdexec/CmdExecSandbox.java
index 8ac7923..de7f42f 100644
--- a/test/fr/devinsy/util/cmdexec/CmdExecSandbox.java
+++ b/test/fr/devinsy/cmdexec/CmdExecSandbox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2017 Christian Pierre MOMON
+ * Copyright (C) 2013,2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-cmdexec.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-cmdexec.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.cmdexec;
+package fr.devinsy.cmdexec;
 
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.PatternLayout;
diff --git a/test/fr/devinsy/util/cmdexec/util/CommandSplitterTest.java b/test/fr/devinsy/cmdexec/util/CommandSplitterTest.java
similarity index 93%
rename from test/fr/devinsy/util/cmdexec/util/CommandSplitterTest.java
rename to test/fr/devinsy/cmdexec/util/CommandSplitterTest.java
index 89be0d1..4fc3ce9 100644
--- a/test/fr/devinsy/util/cmdexec/util/CommandSplitterTest.java
+++ b/test/fr/devinsy/cmdexec/util/CommandSplitterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Christian Pierre MOMON
+ * Copyright (C) 2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-cmdexec.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-cmdexec.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.cmdexec.util;
+package fr.devinsy.cmdexec.util;
 
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Level;
@@ -26,6 +26,7 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import fr.devinsy.cmdexec.util.CommandSplitter;
 import fr.devinsy.strings.StringList;
 
 /**