diff --git a/org.eclipse.efbt.util.dependencies/.classpath b/org.eclipse.efbt.dependencies/.classpath
similarity index 85%
rename from org.eclipse.efbt.util.dependencies/.classpath
rename to org.eclipse.efbt.dependencies/.classpath
index dc9b3f548..c7e48c499 100644
--- a/org.eclipse.efbt.util.dependencies/.classpath
+++ b/org.eclipse.efbt.dependencies/.classpath
@@ -1,21 +1,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.eclipse.efbt.util.dependencies/.project b/org.eclipse.efbt.dependencies/.project
similarity index 94%
rename from org.eclipse.efbt.util.dependencies/.project
rename to org.eclipse.efbt.dependencies/.project
index 0824d7446..c13d1ebb2 100644
--- a/org.eclipse.efbt.util.dependencies/.project
+++ b/org.eclipse.efbt.dependencies/.project
@@ -1,6 +1,6 @@
- org.eclipse.efbt.util.dependencies
+ org.eclipse.efbt.dependencies
diff --git a/org.eclipse.efbt.util.dependencies/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.efbt.dependencies/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.efbt.util.dependencies/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.efbt.dependencies/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.efbt.util.dependencies/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.efbt.dependencies/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from org.eclipse.efbt.util.dependencies/.settings/org.eclipse.m2e.core.prefs
rename to org.eclipse.efbt.dependencies/.settings/org.eclipse.m2e.core.prefs
diff --git a/org.eclipse.efbt.util.dependencies/build.properties b/org.eclipse.efbt.dependencies/build.properties
similarity index 100%
rename from org.eclipse.efbt.util.dependencies/build.properties
rename to org.eclipse.efbt.dependencies/build.properties
diff --git a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/.classpath b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/.classpath
similarity index 100%
rename from org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/.classpath
rename to org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/.classpath
diff --git a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/.project b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/.project
similarity index 92%
rename from org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/.project
rename to org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/.project
index c6d724454..61d2a32a0 100644
--- a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/.project
+++ b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/.project
@@ -1,6 +1,6 @@
- org.eclipse.efbt.util.access.impl.jackess
+ org.eclipse.efbt.dependencies.access.jackcess
diff --git a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/.settings/org.eclipse.m2e.core.prefs
rename to org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/.settings/org.eclipse.m2e.core.prefs
diff --git a/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/META-INF/MANIFEST.MF b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..23285b709
--- /dev/null
+++ b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Export-Package: org.eclipse.efbt.dependencies.access.jackcess;uses:="c
+ om.healthmarketscience.jackcess";version="1.0.0.SNAPSHOT"
+Bundle-SymbolicName: org.eclipse.efbt.dependencies.org.eclipse.efbt.de
+ pendencies.access.jackcess
+Bundle-Name: org.eclipse.efbt.dependencies.access.jackcess
+Bundle-Version: 1.0.0.SNAPSHOT
+Bundle-ManifestVersion: 2
+Bnd-LastModified: 1595766709966
+Import-Package: com.healthmarketscience.jackcess;version="3.0",org.ecl
+ ipse.efbt.dependencies.access.jackcess;version="1.0"
+Created-By: 1.8.0_102 (Oracle Corporation)
+Tool: Bnd-0.0.357
+
diff --git a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/build.properties b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/build.properties
similarity index 100%
rename from org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/build.properties
rename to org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/build.properties
diff --git a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/pom.xml b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/pom.xml
similarity index 92%
rename from org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/pom.xml
rename to org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/pom.xml
index 696c5f35c..867c04acc 100644
--- a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/pom.xml
+++ b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/pom.xml
@@ -9,7 +9,7 @@
1.0.0-SNAPSHOT
- org.eclipse.efbt.util.access.impl.jackess
+ org.eclipse.efbt.dependencies.access.jackcess
diff --git a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/src/main/java/org/eclipse/efbt/util/access/impl/jackess/JackcessUtils.java b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/src/main/java/org/eclipse/efbt/dependencies/access/jackcess/JackcessUtils.java
similarity index 92%
rename from org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/src/main/java/org/eclipse/efbt/util/access/impl/jackess/JackcessUtils.java
rename to org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/src/main/java/org/eclipse/efbt/dependencies/access/jackcess/JackcessUtils.java
index ad0cbf1c1..b7aebc740 100644
--- a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/src/main/java/org/eclipse/efbt/util/access/impl/jackess/JackcessUtils.java
+++ b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/src/main/java/org/eclipse/efbt/dependencies/access/jackcess/JackcessUtils.java
@@ -1,4 +1,4 @@
-package org.eclipse.efbt.util.access.impl.jackess;
+package org.eclipse.efbt.dependencies.access.jackcess;
import java.io.File;
import java.io.IOException;
diff --git a/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/classes/org/eclipse/efbt/dependencies/access/jackcess/JackcessUtils.class b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/classes/org/eclipse/efbt/dependencies/access/jackcess/JackcessUtils.class
new file mode 100644
index 000000000..6c0364a2f
Binary files /dev/null and b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/classes/org/eclipse/efbt/dependencies/access/jackcess/JackcessUtils.class differ
diff --git a/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/maven-archiver/pom.properties b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/maven-archiver/pom.properties
new file mode 100644
index 000000000..32c767a15
--- /dev/null
+++ b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Sun Jul 26 13:20:12 BST 2020
+version=1.0.0-SNAPSHOT
+groupId=org.eclipse.efbt.dependencies
+artifactId=org.eclipse.efbt.dependencies.access.jackcess
diff --git a/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 000000000..c5a2a9b77
--- /dev/null
+++ b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1 @@
+org\eclipse\efbt\dependencies\access\jackcess\JackcessUtils.class
diff --git a/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 000000000..74b862c99
--- /dev/null
+++ b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1 @@
+C:\Users\neil\git\efbt-tidyupdeps\org.eclipse.efbt.dependencies\org.eclipse.efbt.dependencies.access.jackcess\src\main\java\org\eclipse\efbt\dependencies\access\jackcess\JackcessUtils.java
diff --git a/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/org.eclipse.efbt.dependencies.access.jackcess-1.0.0-SNAPSHOT.jar b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/org.eclipse.efbt.dependencies.access.jackcess-1.0.0-SNAPSHOT.jar
new file mode 100644
index 000000000..775b972a2
Binary files /dev/null and b/org.eclipse.efbt.dependencies/org.eclipse.efbt.dependencies.access.jackcess/target/org.eclipse.efbt.dependencies.access.jackcess-1.0.0-SNAPSHOT.jar differ
diff --git a/org.eclipse.efbt.util.dependencies/pom.xml b/org.eclipse.efbt.dependencies/pom.xml
similarity index 89%
rename from org.eclipse.efbt.util.dependencies/pom.xml
rename to org.eclipse.efbt.dependencies/pom.xml
index 6a2ca3829..6b4e1d777 100644
--- a/org.eclipse.efbt.util.dependencies/pom.xml
+++ b/org.eclipse.efbt.dependencies/pom.xml
@@ -19,7 +19,7 @@
- org.eclipse.efbt.util.access.impl.jackess
+ org.eclipse.efbt.dependencies.access.jackcess
pomfirst-thirdparty
@@ -31,11 +31,7 @@
jackcess
3.0.1
-
- org.apache.commons
- commons-csv
- 1.5
-
+
diff --git a/org.eclipse.efbt.util.dependencies/pomfirst-thirdparty/META-INF/MANIFEST.MF b/org.eclipse.efbt.dependencies/pomfirst-thirdparty/META-INF/MANIFEST.MF
similarity index 94%
rename from org.eclipse.efbt.util.dependencies/pomfirst-thirdparty/META-INF/MANIFEST.MF
rename to org.eclipse.efbt.dependencies/pomfirst-thirdparty/META-INF/MANIFEST.MF
index 8e9a05950..87a218a85 100644
--- a/org.eclipse.efbt.util.dependencies/pomfirst-thirdparty/META-INF/MANIFEST.MF
+++ b/org.eclipse.efbt.dependencies/pomfirst-thirdparty/META-INF/MANIFEST.MF
@@ -1,34 +1,34 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.eclipse.efbt.dependencies.pomfirst-thirdparty
-Embed-Directory: jars
-Built-By: Neil
-Bundle-ManifestVersion: 2
-Bnd-LastModified: 1592840155301
-Embed-Dependency: jackcess
-Import-Package: com.healthmarketscience.jackcess;version="3.0",com.hea
- lthmarketscience.jackcess.complex;version="3.0",com.healthmarketscien
- ce.jackcess.expr;version="3.0",com.healthmarketscience.jackcess.impl;
- version="3.0",com.healthmarketscience.jackcess.impl.complex;version="
- 3.0",com.healthmarketscience.jackcess.impl.expr;version="3.0",com.hea
- lthmarketscience.jackcess.impl.query;version="3.0",com.healthmarketsc
- ience.jackcess.query;version="3.0",com.healthmarketscience.jackcess.u
- til;version="3.0",javax.script,org.apache.commons.lang3;version="3.8"
- ,org.apache.commons.lang3.builder;version="3.8",org.apache.commons.la
- ng3.text;version="3.8",org.apache.commons.logging;version="1.2",org.a
- pache.poi.poifs.filesystem
-Tool: Bnd-0.0.357
-Export-Package: com.healthmarketscience.jackcess.complex;version="3.0.
- 1",com.healthmarketscience.jackcess.impl.query;version="3.0.1",com.he
- althmarketscience.jackcess.query;version="3.0.1",com.healthmarketscie
- nce.jackcess;version="3.0.1",com.healthmarketscience.jackcess.impl;ve
- rsion="3.0.1",com.healthmarketscience.jackcess.impl.complex;version="
- 3.0.1",com.healthmarketscience.jackcess.expr;version="3.0.1",com.heal
- thmarketscience.jackcess.impl.expr;version="3.0.1",com.healthmarketsc
- ience.jackcess.util;version="3.0.1"
-Bundle-Version: 1.0.0.SNAPSHOT
-Bundle-Name: pomfirst-thirdparty
-Bundle-ClassPath: jars/jackcess-3.0.1.jar
-Embed-Transitive: true
-Created-By: Apache Maven Bundle Plugin
-Build-Jdk: 1.8.0_192
-
+Manifest-Version: 1.0
+Bundle-SymbolicName: org.eclipse.efbt.dependencies.pomfirst-thirdparty
+Embed-Directory: jars
+Built-By: neil
+Bundle-ManifestVersion: 2
+Bnd-LastModified: 1595766710834
+Embed-Dependency: jackcess
+Import-Package: com.healthmarketscience.jackcess;version="3.0",com.hea
+ lthmarketscience.jackcess.complex;version="3.0",com.healthmarketscien
+ ce.jackcess.expr;version="3.0",com.healthmarketscience.jackcess.impl;
+ version="3.0",com.healthmarketscience.jackcess.impl.complex;version="
+ 3.0",com.healthmarketscience.jackcess.impl.expr;version="3.0",com.hea
+ lthmarketscience.jackcess.impl.query;version="3.0",com.healthmarketsc
+ ience.jackcess.query;version="3.0",com.healthmarketscience.jackcess.u
+ til;version="3.0",javax.script,org.apache.commons.lang3;version="3.8"
+ ,org.apache.commons.lang3.builder;version="3.8",org.apache.commons.la
+ ng3.text;version="3.8",org.apache.commons.logging;version="1.2",org.a
+ pache.poi.poifs.filesystem
+Tool: Bnd-0.0.357
+Export-Package: com.healthmarketscience.jackcess.complex;version="3.0.
+ 1",com.healthmarketscience.jackcess.impl.query;version="3.0.1",com.he
+ althmarketscience.jackcess.query;version="3.0.1",com.healthmarketscie
+ nce.jackcess;version="3.0.1",com.healthmarketscience.jackcess.impl;ve
+ rsion="3.0.1",com.healthmarketscience.jackcess.impl.complex;version="
+ 3.0.1",com.healthmarketscience.jackcess.expr;version="3.0.1",com.heal
+ thmarketscience.jackcess.impl.expr;version="3.0.1",com.healthmarketsc
+ ience.jackcess.util;version="3.0.1"
+Bundle-Version: 1.0.0.SNAPSHOT
+Bundle-Name: pomfirst-thirdparty
+Bundle-ClassPath: jars/jackcess-3.0.1.jar
+Embed-Transitive: true
+Created-By: Apache Maven Bundle Plugin
+Build-Jdk: 1.8.0_102
+
diff --git a/org.eclipse.efbt.util.dependencies/pomfirst-thirdparty/pom.xml b/org.eclipse.efbt.dependencies/pomfirst-thirdparty/pom.xml
similarity index 100%
rename from org.eclipse.efbt.util.dependencies/pomfirst-thirdparty/pom.xml
rename to org.eclipse.efbt.dependencies/pomfirst-thirdparty/pom.xml
diff --git a/org.eclipse.efbt.parent/org.eclipse.efbt.util.access.impl.jackcess/META-INF/MANIFEST.MF b/org.eclipse.efbt.parent/org.eclipse.efbt.util.access.impl.jackcess/META-INF/MANIFEST.MF
index cc5977965..e06a4d9ba 100644
--- a/org.eclipse.efbt.parent/org.eclipse.efbt.util.access.impl.jackcess/META-INF/MANIFEST.MF
+++ b/org.eclipse.efbt.parent/org.eclipse.efbt.util.access.impl.jackcess/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Automatic-Module-Name: org.eclipse.efbt.util.access.impl.jackcess
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.efbt.util.access.interface;bundle-version="1.0.0"
Export-Package: org.eclipse.efbt.util.access.impl.jackcess
-Import-Package: org.eclipse.efbt.util.access.impl.jackess,
+Import-Package: org.eclipse.efbt.dependencies.access.jackcess,
com.healthmarketscience.jackcess
diff --git a/org.eclipse.efbt.parent/pom.xml b/org.eclipse.efbt.parent/pom.xml
index ff85b0116..2de04cb00 100644
--- a/org.eclipse.efbt.parent/pom.xml
+++ b/org.eclipse.efbt.parent/pom.xml
@@ -57,7 +57,7 @@
org.eclipse.efbt.dependencies
- org.eclipse.efbt.util.access.impl.jackess
+ org.eclipse.efbt.dependencies.access.jackcess
1.0.0-SNAPSHOT
@@ -375,7 +375,7 @@
org.eclipse.efbt.dependencies
- org.eclipse.efbt.util.access.impl.jackess
+ org.eclipse.efbt.dependencies.access.jackcess
1.0.0-SNAPSHOT
diff --git a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/META-INF/MANIFEST.MF b/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/META-INF/MANIFEST.MF
deleted file mode 100644
index 8b142ef4a..000000000
--- a/org.eclipse.efbt.util.dependencies/org.eclipse.efbt.util.access.impl.jackess/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.efbt.util.access.impl.jackess;uses:="com.h
- ealthmarketscience.jackcess";version="1.0.0.SNAPSHOT"
-Bundle-SymbolicName: org.eclipse.efbt.dependencies.org.eclipse.efbt.ut
- il.access.impl.jackess
-Bundle-Name: org.eclipse.efbt.util.access.impl.jackess
-Bundle-Version: 1.0.0.SNAPSHOT
-Bundle-ManifestVersion: 2
-Bnd-LastModified: 1594564715412
-Import-Package: com.healthmarketscience.jackcess;version="3.0",org.ecl
- ipse.efbt.util.access.impl.jackess;version="1.0"
-Created-By: 1.8.0_192 (Oracle Corporation)
-Tool: Bnd-0.0.357
-