diff --git a/build.gradle b/build.gradle
index abf6100..9ff5a28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,8 @@
 dependencies {
 	compile project(':core.worker')
 
+	compile 'com.github.boukefalos:jlibpipe:0.1'
+
 	compile 'commons-io:commons-io:2.+'
 	compile 'commons-cli:commons-cli:1.+'	
 	compile 'commons-pool:commons-pool:1.+'
diff --git a/src/main/java/pipe/Pipe.java b/src/main/java/pipe/Pipe.java
index 05a3c41..f734658 100644
--- a/src/main/java/pipe/Pipe.java
+++ b/src/main/java/pipe/Pipe.java
@@ -16,6 +16,8 @@
  */
 package pipe;
 
+import com.github.boukefalos.jlibloader.Native;
+
 /**
  * @author Vikram S Khatri vikram.khatri@us.ibm.com
  */
@@ -26,7 +28,7 @@ public class Pipe {
     static final int PIPE_WAIT = 0x00000000;
     
     static {
-        System.loadLibrary("pipe");
+        Native.load("com.github.boukefalos", "jlibpipe");
     }
 
     public static final native int CreateNamedPipe(
diff --git a/src/main/java/pipe/TestPipe.java b/src/main/java/pipe/TestPipe.java
index d6f56ee..f70801a 100644
--- a/src/main/java/pipe/TestPipe.java
+++ b/src/main/java/pipe/TestPipe.java
@@ -95,8 +95,8 @@ public class TestPipe {
 
     public static void main(String[] args) {
         String pipeName = "\\\\.\\pipe\\detest";
-        String fileName = "txt/bla.txt";
-        //fileName = "C:\\Users\\Rik\\Music\\Artists\\+44\\When Your Heart Stops Beating\\+44 - 155.mp3";
+        String fileName = "txt/mp3";
+        fileName = "C:\\Users\\Rik\\Music\\Artists\\+44\\When Your Heart Stops Beating\\+44 - 155.mp3";
         TestPipe testPipe = new TestPipe(pipeName, fileName);
         testPipe.runPipe();
     }
diff --git a/src/main/resources/txt/options b/src/main/resources/txt/lame
similarity index 100%
rename from src/main/resources/txt/options
rename to src/main/resources/txt/lame
diff --git a/src/main/resources/txt/short b/src/main/resources/txt/short
deleted file mode 100644
index 538d3ff..0000000
--- a/src/main/resources/txt/short
+++ /dev/null
@@ -1 +0,0 @@
-medium.mp3
\ No newline at end of file
diff --git a/src/main/java/test/SoundAudit.java b/src/test/java/test/SoundAudit.java
similarity index 100%
rename from src/main/java/test/SoundAudit.java
rename to src/test/java/test/SoundAudit.java
diff --git a/src/main/java/test/Test.java b/src/test/java/test/Test.java
similarity index 100%
rename from src/main/java/test/Test.java
rename to src/test/java/test/Test.java
diff --git a/src/main/java/test/lines/Main.java b/src/test/java/test/lines/Main.java
similarity index 100%
rename from src/main/java/test/lines/Main.java
rename to src/test/java/test/lines/Main.java
diff --git a/src/main/java/test/lines/SourceLine.java b/src/test/java/test/lines/SourceLine.java
similarity index 100%
rename from src/main/java/test/lines/SourceLine.java
rename to src/test/java/test/lines/SourceLine.java
diff --git a/src/main/java/test/lines/TargetLine.java b/src/test/java/test/lines/TargetLine.java
similarity index 100%
rename from src/main/java/test/lines/TargetLine.java
rename to src/test/java/test/lines/TargetLine.java