diff --git a/.gitignore b/.gitignore
index b1cb804..caf04d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+.gradle/
*.sw?
build/
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..3053947
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: "groovy"
+apply plugin: "maven"
+
+group = "com.jdblabs.timestamper"
+version = "1.2"
+
+repositories {
+ mavenLocal()
+ mavenCentral() }
+
+dependencies {
+ compile 'ch.qos.logback:logback-classic:1.1.2'
+ compile 'ch.qos.logback:logback-core:1.1.2'
+ compile 'com.martiansoftware:nailgun-server:0.9.1'
+ compile 'org.slf4j:slf4j-api:1.7.10'
+ compile 'com.jdbernard:jdb-util:3.4'
+ compile 'com.jdblabs.timestamper:timestamper-lib:2.1'
+
+ compile files('lib/jansi-1.12-SNAPSHOT.jar')
+}
diff --git a/jdb-build-1.10.xml b/jdb-build-1.10.xml
deleted file mode 100644
index 38056a4..0000000
--- a/jdb-build-1.10.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/jdblabs.ivysettings-1.10.xml b/jdblabs.ivysettings-1.10.xml
deleted file mode 100644
index 23dff93..0000000
--- a/jdblabs.ivysettings-1.10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/compile/jar/jdb-util-2.0.jar b/lib/compile/jar/jdb-util-2.0.jar
deleted file mode 100644
index c1a421a..0000000
Binary files a/lib/compile/jar/jdb-util-2.0.jar and /dev/null differ
diff --git a/lib/compile/jar/nailgun-0.7.1.jar b/lib/compile/jar/nailgun-0.7.1.jar
deleted file mode 100644
index 05cbbaf..0000000
Binary files a/lib/compile/jar/nailgun-0.7.1.jar and /dev/null differ
diff --git a/lib/compile/jar/slf4j-api-1.6.1.jar b/lib/compile/jar/slf4j-api-1.6.1.jar
deleted file mode 100644
index 42e0ad0..0000000
Binary files a/lib/compile/jar/slf4j-api-1.6.1.jar and /dev/null differ
diff --git a/lib/compile/jar/timestamper-lib-2.1.jar b/lib/compile/jar/timestamper-lib-2.1.jar
deleted file mode 100644
index 7f496a7..0000000
Binary files a/lib/compile/jar/timestamper-lib-2.1.jar and /dev/null differ
diff --git a/lib/compile/jar/jansi-1.12-SNAPSHOT.jar b/lib/jansi-1.12-SNAPSHOT.jar
similarity index 100%
rename from lib/compile/jar/jansi-1.12-SNAPSHOT.jar
rename to lib/jansi-1.12-SNAPSHOT.jar
diff --git a/lib/runtime/jar/commons-beanutils-1.8.0.jar b/lib/runtime/jar/commons-beanutils-1.8.0.jar
deleted file mode 100644
index caf7ae3..0000000
Binary files a/lib/runtime/jar/commons-beanutils-1.8.0.jar and /dev/null differ
diff --git a/lib/runtime/jar/commons-codec-1.4.jar b/lib/runtime/jar/commons-codec-1.4.jar
deleted file mode 100644
index 458d432..0000000
Binary files a/lib/runtime/jar/commons-codec-1.4.jar and /dev/null differ
diff --git a/lib/runtime/jar/commons-collections-3.2.1.jar b/lib/runtime/jar/commons-collections-3.2.1.jar
deleted file mode 100644
index c35fa1f..0000000
Binary files a/lib/runtime/jar/commons-collections-3.2.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/commons-lang-2.4.jar b/lib/runtime/jar/commons-lang-2.4.jar
deleted file mode 100644
index 532939e..0000000
Binary files a/lib/runtime/jar/commons-lang-2.4.jar and /dev/null differ
diff --git a/lib/runtime/jar/ezmorph-1.0.6.jar b/lib/runtime/jar/ezmorph-1.0.6.jar
deleted file mode 100644
index 30fad12..0000000
Binary files a/lib/runtime/jar/ezmorph-1.0.6.jar and /dev/null differ
diff --git a/lib/runtime/jar/http-builder-0.5.1.jar b/lib/runtime/jar/http-builder-0.5.1.jar
deleted file mode 100644
index 47aa035..0000000
Binary files a/lib/runtime/jar/http-builder-0.5.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/httpclient-4.1.1.jar b/lib/runtime/jar/httpclient-4.1.1.jar
deleted file mode 100644
index c845ef9..0000000
Binary files a/lib/runtime/jar/httpclient-4.1.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/httpclient-cache-4.1.1.jar b/lib/runtime/jar/httpclient-cache-4.1.1.jar
deleted file mode 100644
index 3e1da08..0000000
Binary files a/lib/runtime/jar/httpclient-cache-4.1.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/httpcore-4.1.jar b/lib/runtime/jar/httpcore-4.1.jar
deleted file mode 100644
index a357c07..0000000
Binary files a/lib/runtime/jar/httpcore-4.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/httpmime-4.1.1.jar b/lib/runtime/jar/httpmime-4.1.1.jar
deleted file mode 100644
index 01af40b..0000000
Binary files a/lib/runtime/jar/httpmime-4.1.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/jansi-1.12-SNAPSHOT.jar b/lib/runtime/jar/jansi-1.12-SNAPSHOT.jar
deleted file mode 100644
index 63dce55..0000000
Binary files a/lib/runtime/jar/jansi-1.12-SNAPSHOT.jar and /dev/null differ
diff --git a/lib/runtime/jar/jcl-over-slf4j-1.6.1.jar b/lib/runtime/jar/jcl-over-slf4j-1.6.1.jar
deleted file mode 100644
index 79e1ec2..0000000
Binary files a/lib/runtime/jar/jcl-over-slf4j-1.6.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/jdb-util-2.0.jar b/lib/runtime/jar/jdb-util-2.0.jar
deleted file mode 100644
index c1a421a..0000000
Binary files a/lib/runtime/jar/jdb-util-2.0.jar and /dev/null differ
diff --git a/lib/runtime/jar/json-lib-2.3-jdk15.jar b/lib/runtime/jar/json-lib-2.3-jdk15.jar
deleted file mode 100644
index 29d59b9..0000000
Binary files a/lib/runtime/jar/json-lib-2.3-jdk15.jar and /dev/null differ
diff --git a/lib/runtime/jar/logback-classic-0.9.26.jar b/lib/runtime/jar/logback-classic-0.9.26.jar
deleted file mode 100644
index b900b64..0000000
Binary files a/lib/runtime/jar/logback-classic-0.9.26.jar and /dev/null differ
diff --git a/lib/runtime/jar/logback-core-0.9.26.jar b/lib/runtime/jar/logback-core-0.9.26.jar
deleted file mode 100644
index d50f3cd..0000000
Binary files a/lib/runtime/jar/logback-core-0.9.26.jar and /dev/null differ
diff --git a/lib/runtime/jar/nailgun-0.7.1.jar b/lib/runtime/jar/nailgun-0.7.1.jar
deleted file mode 100644
index 05cbbaf..0000000
Binary files a/lib/runtime/jar/nailgun-0.7.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/nekohtml-1.9.9.jar b/lib/runtime/jar/nekohtml-1.9.9.jar
deleted file mode 100644
index 2e06271..0000000
Binary files a/lib/runtime/jar/nekohtml-1.9.9.jar and /dev/null differ
diff --git a/lib/runtime/jar/slf4j-api-1.6.1.jar b/lib/runtime/jar/slf4j-api-1.6.1.jar
deleted file mode 100644
index 42e0ad0..0000000
Binary files a/lib/runtime/jar/slf4j-api-1.6.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/timestamper-lib-2.1.jar b/lib/runtime/jar/timestamper-lib-2.1.jar
deleted file mode 100644
index 7f496a7..0000000
Binary files a/lib/runtime/jar/timestamper-lib-2.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/xercesImpl-2.8.1.jar b/lib/runtime/jar/xercesImpl-2.8.1.jar
deleted file mode 100644
index 3b351f6..0000000
Binary files a/lib/runtime/jar/xercesImpl-2.8.1.jar and /dev/null differ
diff --git a/lib/runtime/jar/xml-apis-1.3.04.jar b/lib/runtime/jar/xml-apis-1.3.04.jar
deleted file mode 100644
index d42c0ea..0000000
Binary files a/lib/runtime/jar/xml-apis-1.3.04.jar and /dev/null differ
diff --git a/lib/runtime/jar/xml-resolver-1.2.jar b/lib/runtime/jar/xml-resolver-1.2.jar
deleted file mode 100644
index e535bdc..0000000
Binary files a/lib/runtime/jar/xml-resolver-1.2.jar and /dev/null differ
diff --git a/project.properties b/project.properties
deleted file mode 100644
index 68bd881..0000000
--- a/project.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat, 26 Oct 2013 10:08:40 -0500
-lib.local=true
-name=timestamper-cli
-version=1.2
-build.number=0
-main.class=com.jdblabs.timestamper.cli.TimeStamperCLI
-executable.jar=true
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..074cc16
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "timestamper-cli"
diff --git a/src/main/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy b/src/main/groovy/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy
similarity index 99%
rename from src/main/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy
rename to src/main/groovy/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy
index ea1573c..5438255 100644
--- a/src/main/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy
+++ b/src/main/groovy/com/jdblabs/timestamper/cli/TimeStamperCLI.groovy
@@ -49,7 +49,7 @@ public class TimeStamperCLI {
//out = new PrintStream(AnsiConsole.wrapOutputStream(out))
def opts = LightOptionParser.parseOptions(cli, args as List)
- File workingDir = new File(opts.d ?: '.')
+ File workingDir = new File(opts.d[0] ?: '.')
String ttyDevice = opts.tty ?: '/dev/tty'
if (opts.h) println USAGE