diff --git a/README.md b/README.md
index b450457..10efc1d 100644
--- a/README.md
+++ b/README.md
@@ -50,16 +50,17 @@ This is a test ~senctence~**for diffutils**.
 But it can easily replaced by any other which is better for handing your texts. I have plan to add implementation of some in future.
 
 ### Changelog ###
-  * Version 1.4
+  * Version 2.0
     * switch to maven and removed other artifacts
     * changed groupid to **com.github.java-diff-utils** due to different forks at github
     * updated maven plugins
     * JDK 1.8 compatibility, sorry if you have to stick with older versions
     * support for inline merge 
-    * restructured packages
+    * restructured packages heavily
     * changed API 
     * changed Algorithm to provide only cursor positions
-    * integrated JGit (Eclipse Licensed) to provide HistogramDiff to gain speed for large datasets
+    * integrated JGit (Eclipse Licensed) to provide HistogramDiff to gain speed for large datasets 
+    * removed all kinds of helper classes in favour of new JDK 8 function classes like Predicate
   * Version 1.2
     * JDK 1.5 compatibility
     * Ant build script
diff --git a/pom.xml b/pom.xml
index c45a7d7..6d4cdd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.github.java-diff-utils</groupId>
     <artifactId>diffutils</artifactId>
     <packaging>jar</packaging>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>2.0-SNAPSHOT</version>
 
     <name>java-diff-utils</name>
     <description>The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.</description>
diff --git a/src/main/java/difflib/DiffUtils.java b/src/main/java/com/github/difflib/DiffUtils.java
similarity index 94%
rename from src/main/java/difflib/DiffUtils.java
rename to src/main/java/com/github/difflib/DiffUtils.java
index 6953148..9a8a3d2 100644
--- a/src/main/java/difflib/DiffUtils.java
+++ b/src/main/java/com/github/difflib/DiffUtils.java
@@ -17,14 +17,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib;
+package com.github.difflib;
 
-import difflib.algorithm.DiffAlgorithm;
-import difflib.algorithm.DiffException;
-import difflib.algorithm.myers.MyersDiff;
-import difflib.patch.Delta;
-import difflib.patch.Patch;
-import difflib.patch.PatchFailedException;
+import com.github.difflib.algorithm.DiffAlgorithm;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.algorithm.myers.MyersDiff;
+import com.github.difflib.patch.Delta;
+import com.github.difflib.patch.Patch;
+import com.github.difflib.patch.PatchFailedException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
diff --git a/src/main/java/difflib/UnifiedDiffUtils.java b/src/main/java/com/github/difflib/UnifiedDiffUtils.java
similarity index 98%
rename from src/main/java/difflib/UnifiedDiffUtils.java
rename to src/main/java/com/github/difflib/UnifiedDiffUtils.java
index f1373da..c48b050 100644
--- a/src/main/java/difflib/UnifiedDiffUtils.java
+++ b/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package difflib;
+package com.github.difflib;
 
-import difflib.patch.ChangeDelta;
-import difflib.patch.Chunk;
-import difflib.patch.Delta;
-import difflib.patch.Patch;
+import com.github.difflib.patch.ChangeDelta;
+import com.github.difflib.patch.Chunk;
+import com.github.difflib.patch.Delta;
+import com.github.difflib.patch.Patch;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
diff --git a/src/main/java/difflib/algorithm/Change.java b/src/main/java/com/github/difflib/algorithm/Change.java
similarity index 93%
rename from src/main/java/difflib/algorithm/Change.java
rename to src/main/java/com/github/difflib/algorithm/Change.java
index 85c5bb3..eb21d3f 100644
--- a/src/main/java/difflib/algorithm/Change.java
+++ b/src/main/java/com/github/difflib/algorithm/Change.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package difflib.algorithm;
+package com.github.difflib.algorithm;
 
-import difflib.patch.DeltaType;
+import com.github.difflib.patch.DeltaType;
 
 /**
  *
diff --git a/src/main/java/difflib/algorithm/DiffAlgorithm.java b/src/main/java/com/github/difflib/algorithm/DiffAlgorithm.java
similarity index 96%
rename from src/main/java/difflib/algorithm/DiffAlgorithm.java
rename to src/main/java/com/github/difflib/algorithm/DiffAlgorithm.java
index 9dd45b3..e6a2015 100644
--- a/src/main/java/difflib/algorithm/DiffAlgorithm.java
+++ b/src/main/java/com/github/difflib/algorithm/DiffAlgorithm.java
@@ -17,9 +17,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.algorithm;
+package com.github.difflib.algorithm;
 
-import difflib.patch.Patch;
+import com.github.difflib.patch.Patch;
 import java.util.*;
 
 /**
diff --git a/src/main/java/difflib/algorithm/DiffException.java b/src/main/java/com/github/difflib/algorithm/DiffException.java
similarity index 95%
rename from src/main/java/difflib/algorithm/DiffException.java
rename to src/main/java/com/github/difflib/algorithm/DiffException.java
index 364c802..491bf38 100644
--- a/src/main/java/difflib/algorithm/DiffException.java
+++ b/src/main/java/com/github/difflib/algorithm/DiffException.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.algorithm;
+package com.github.difflib.algorithm;
 
 public class DiffException extends Exception {
 
diff --git a/src/main/java/difflib/algorithm/DifferentiationFailedException.java b/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java
similarity index 92%
rename from src/main/java/difflib/algorithm/DifferentiationFailedException.java
rename to src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java
index 58280ae..132288f 100644
--- a/src/main/java/difflib/algorithm/DifferentiationFailedException.java
+++ b/src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java
@@ -17,9 +17,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.algorithm;
+package com.github.difflib.algorithm;
 
-import difflib.algorithm.DiffException;
+import com.github.difflib.algorithm.DiffException;
 
 /**
  * Thrown whenever the differencing engine cannot produce the differences between two revisions of
diff --git a/src/main/java/difflib/algorithm/jgit/JGitDiff.java b/src/main/java/com/github/difflib/algorithm/jgit/JGitDiff.java
similarity index 92%
rename from src/main/java/difflib/algorithm/jgit/JGitDiff.java
rename to src/main/java/com/github/difflib/algorithm/jgit/JGitDiff.java
index 5362bd4..9bb0524 100644
--- a/src/main/java/difflib/algorithm/jgit/JGitDiff.java
+++ b/src/main/java/com/github/difflib/algorithm/jgit/JGitDiff.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package difflib.algorithm.jgit;
+package com.github.difflib.algorithm.jgit;
 
-import difflib.algorithm.Change;
-import difflib.algorithm.DiffAlgorithm;
-import difflib.algorithm.DiffException;
-import difflib.patch.DeltaType;
+import com.github.difflib.algorithm.Change;
+import com.github.difflib.algorithm.DiffAlgorithm;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.DeltaType;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
diff --git a/src/main/java/difflib/algorithm/myers/MyersDiff.java b/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
similarity index 95%
rename from src/main/java/difflib/algorithm/myers/MyersDiff.java
rename to src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
index 4e2f603..6907f68 100644
--- a/src/main/java/difflib/algorithm/myers/MyersDiff.java
+++ b/src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
@@ -17,14 +17,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.algorithm.myers;
+package com.github.difflib.algorithm.myers;
 
-import difflib.algorithm.Change;
-import difflib.algorithm.DifferentiationFailedException;
-import difflib.algorithm.DiffAlgorithm;
-import difflib.algorithm.DiffException;
-import difflib.patch.DeltaType;
-import difflib.patch.Patch;
+import com.github.difflib.algorithm.Change;
+import com.github.difflib.algorithm.DifferentiationFailedException;
+import com.github.difflib.algorithm.DiffAlgorithm;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.DeltaType;
+import com.github.difflib.patch.Patch;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
diff --git a/src/main/java/difflib/algorithm/myers/PathNode.java b/src/main/java/com/github/difflib/algorithm/myers/PathNode.java
similarity index 98%
rename from src/main/java/difflib/algorithm/myers/PathNode.java
rename to src/main/java/com/github/difflib/algorithm/myers/PathNode.java
index c9490f4..c60b482 100644
--- a/src/main/java/difflib/algorithm/myers/PathNode.java
+++ b/src/main/java/com/github/difflib/algorithm/myers/PathNode.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.algorithm.myers;
+package com.github.difflib.algorithm.myers;
 
 /**
  * A node in a diffpath.
diff --git a/src/main/java/difflib/patch/ChangeDelta.java b/src/main/java/com/github/difflib/patch/ChangeDelta.java
similarity index 98%
rename from src/main/java/difflib/patch/ChangeDelta.java
rename to src/main/java/com/github/difflib/patch/ChangeDelta.java
index 10e8a52..34a8bd6 100644
--- a/src/main/java/difflib/patch/ChangeDelta.java
+++ b/src/main/java/com/github/difflib/patch/ChangeDelta.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.patch;
+package com.github.difflib.patch;
 
 import java.util.List;
 
diff --git a/src/main/java/difflib/patch/Chunk.java b/src/main/java/com/github/difflib/patch/Chunk.java
similarity index 99%
rename from src/main/java/difflib/patch/Chunk.java
rename to src/main/java/com/github/difflib/patch/Chunk.java
index 3de1a9e..8b21e7b 100644
--- a/src/main/java/difflib/patch/Chunk.java
+++ b/src/main/java/com/github/difflib/patch/Chunk.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.patch;
+package com.github.difflib.patch;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/difflib/patch/DeleteDelta.java b/src/main/java/com/github/difflib/patch/DeleteDelta.java
similarity index 98%
rename from src/main/java/difflib/patch/DeleteDelta.java
rename to src/main/java/com/github/difflib/patch/DeleteDelta.java
index 871a130..f65d866 100644
--- a/src/main/java/difflib/patch/DeleteDelta.java
+++ b/src/main/java/com/github/difflib/patch/DeleteDelta.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.patch;
+package com.github.difflib.patch;
 
 import java.util.List;
 
diff --git a/src/main/java/difflib/patch/Delta.java b/src/main/java/com/github/difflib/patch/Delta.java
similarity index 99%
rename from src/main/java/difflib/patch/Delta.java
rename to src/main/java/com/github/difflib/patch/Delta.java
index 7e6722a..090f4ba 100644
--- a/src/main/java/difflib/patch/Delta.java
+++ b/src/main/java/com/github/difflib/patch/Delta.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.patch;
+package com.github.difflib.patch;
 
 import java.util.*;
 
diff --git a/src/main/java/difflib/patch/DeltaType.java b/src/main/java/com/github/difflib/patch/DeltaType.java
similarity index 96%
rename from src/main/java/difflib/patch/DeltaType.java
rename to src/main/java/com/github/difflib/patch/DeltaType.java
index 0fe9807..64e550b 100644
--- a/src/main/java/difflib/patch/DeltaType.java
+++ b/src/main/java/com/github/difflib/patch/DeltaType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package difflib.patch;
+package com.github.difflib.patch;
 
 /**
  * Specifies the type of the delta.
diff --git a/src/main/java/difflib/patch/DiffException.java b/src/main/java/com/github/difflib/patch/DiffException.java
similarity index 96%
rename from src/main/java/difflib/patch/DiffException.java
rename to src/main/java/com/github/difflib/patch/DiffException.java
index 64451dc..9b8b53b 100644
--- a/src/main/java/difflib/patch/DiffException.java
+++ b/src/main/java/com/github/difflib/patch/DiffException.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.patch;
+package com.github.difflib.patch;
 
 /**
  * Base class for all exceptions emanating from this package.
diff --git a/src/main/java/difflib/patch/InsertDelta.java b/src/main/java/com/github/difflib/patch/InsertDelta.java
similarity index 98%
rename from src/main/java/difflib/patch/InsertDelta.java
rename to src/main/java/com/github/difflib/patch/InsertDelta.java
index c9ae349..3783c3d 100644
--- a/src/main/java/difflib/patch/InsertDelta.java
+++ b/src/main/java/com/github/difflib/patch/InsertDelta.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.patch;
+package com.github.difflib.patch;
 
 import java.util.List;
 
diff --git a/src/main/java/difflib/patch/Patch.java b/src/main/java/com/github/difflib/patch/Patch.java
similarity index 94%
rename from src/main/java/difflib/patch/Patch.java
rename to src/main/java/com/github/difflib/patch/Patch.java
index a6e4d12..2605b82 100644
--- a/src/main/java/difflib/patch/Patch.java
+++ b/src/main/java/com/github/difflib/patch/Patch.java
@@ -17,11 +17,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.patch;
+package com.github.difflib.patch;
 
-import difflib.algorithm.Change;
-import static difflib.patch.DeltaType.DELETE;
-import static difflib.patch.DeltaType.INSERT;
+import com.github.difflib.algorithm.Change;
+import static com.github.difflib.patch.DeltaType.DELETE;
+import static com.github.difflib.patch.DeltaType.INSERT;
 import java.util.ArrayList;
 import java.util.Collections;
 import static java.util.Comparator.comparing;
diff --git a/src/main/java/difflib/patch/PatchFailedException.java b/src/main/java/com/github/difflib/patch/PatchFailedException.java
similarity index 96%
rename from src/main/java/difflib/patch/PatchFailedException.java
rename to src/main/java/com/github/difflib/patch/PatchFailedException.java
index 109bd18..fa8bf8e 100644
--- a/src/main/java/difflib/patch/PatchFailedException.java
+++ b/src/main/java/com/github/difflib/patch/PatchFailedException.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.patch;
+package com.github.difflib.patch;
 
 /**
  * Thrown whenever a delta cannot be applied as a patch to a given text.
diff --git a/src/main/java/difflib/text/DiffRow.java b/src/main/java/com/github/difflib/text/DiffRow.java
similarity index 98%
rename from src/main/java/difflib/text/DiffRow.java
rename to src/main/java/com/github/difflib/text/DiffRow.java
index 1a393b5..0898836 100644
--- a/src/main/java/difflib/text/DiffRow.java
+++ b/src/main/java/com/github/difflib/text/DiffRow.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.text;
+package com.github.difflib.text;
 
 /**
  * Describes the diff row in form [tag, oldLine, newLine) for showing the difference between two
diff --git a/src/main/java/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java
similarity index 97%
rename from src/main/java/difflib/text/DiffRowGenerator.java
rename to src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 303e61a..6aab869 100644
--- a/src/main/java/difflib/text/DiffRowGenerator.java
+++ b/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -17,17 +17,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.text;
+package com.github.difflib.text;
 
-import difflib.DiffUtils;
-import difflib.algorithm.DiffException;
-import difflib.patch.ChangeDelta;
-import difflib.patch.Chunk;
-import difflib.patch.DeleteDelta;
-import difflib.patch.Delta;
-import difflib.patch.InsertDelta;
-import difflib.patch.Patch;
-import difflib.text.DiffRow.Tag;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.ChangeDelta;
+import com.github.difflib.patch.Chunk;
+import com.github.difflib.patch.DeleteDelta;
+import com.github.difflib.patch.Delta;
+import com.github.difflib.patch.InsertDelta;
+import com.github.difflib.patch.Patch;
+import com.github.difflib.text.DiffRow.Tag;
 import java.util.*;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
diff --git a/src/main/java/difflib/text/StringUtils.java b/src/main/java/com/github/difflib/text/StringUtils.java
similarity index 98%
rename from src/main/java/difflib/text/StringUtils.java
rename to src/main/java/com/github/difflib/text/StringUtils.java
index a5dd1e7..1367334 100644
--- a/src/main/java/difflib/text/StringUtils.java
+++ b/src/main/java/com/github/difflib/text/StringUtils.java
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
  * #L%
  */
-package difflib.text;
+package com.github.difflib.text;
 
 import java.util.List;
 import static java.util.stream.Collectors.toList;
diff --git a/src/test/java/difflib/DiffUtilsTest.java b/src/test/java/com/github/difflib/DiffUtilsTest.java
similarity index 94%
rename from src/test/java/difflib/DiffUtilsTest.java
rename to src/test/java/com/github/difflib/DiffUtilsTest.java
index 5c8ded4..d8aa3cf 100644
--- a/src/test/java/difflib/DiffUtilsTest.java
+++ b/src/test/java/com/github/difflib/DiffUtilsTest.java
@@ -1,12 +1,13 @@
-package difflib;
+package com.github.difflib;
 
-import difflib.algorithm.DiffException;
-import difflib.patch.ChangeDelta;
-import difflib.patch.Chunk;
-import difflib.patch.DeleteDelta;
-import difflib.patch.Delta;
-import difflib.patch.InsertDelta;
-import difflib.patch.Patch;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.ChangeDelta;
+import com.github.difflib.patch.Chunk;
+import com.github.difflib.patch.DeleteDelta;
+import com.github.difflib.patch.Delta;
+import com.github.difflib.patch.InsertDelta;
+import com.github.difflib.patch.Patch;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/test/java/difflib/GenerateUnifiedDiffTest.java b/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
similarity index 94%
rename from src/test/java/difflib/GenerateUnifiedDiffTest.java
rename to src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
index 48d7926..79ceec3 100644
--- a/src/test/java/difflib/GenerateUnifiedDiffTest.java
+++ b/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -1,8 +1,10 @@
-package difflib;
+package com.github.difflib;
 
-import difflib.algorithm.DiffException;
-import difflib.patch.Patch;
-import difflib.patch.PatchFailedException;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.UnifiedDiffUtils;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.Patch;
+import com.github.difflib.patch.PatchFailedException;
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
diff --git a/src/test/java/difflib/TestConstants.java b/src/test/java/com/github/difflib/TestConstants.java
similarity index 93%
rename from src/test/java/difflib/TestConstants.java
rename to src/test/java/com/github/difflib/TestConstants.java
index b2c6760..7abb9a4 100644
--- a/src/test/java/difflib/TestConstants.java
+++ b/src/test/java/com/github/difflib/TestConstants.java
@@ -1,4 +1,4 @@
-package difflib;
+package com.github.difflib;
 
 /**
  * Test constants
diff --git a/src/test/java/difflib/algorithm/jgit/JGitDiffTest.java b/src/test/java/com/github/difflib/algorithm/jgit/JGitDiffTest.java
similarity index 84%
rename from src/test/java/difflib/algorithm/jgit/JGitDiffTest.java
rename to src/test/java/com/github/difflib/algorithm/jgit/JGitDiffTest.java
index e589848..9b307a6 100644
--- a/src/test/java/difflib/algorithm/jgit/JGitDiffTest.java
+++ b/src/test/java/com/github/difflib/algorithm/jgit/JGitDiffTest.java
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package difflib.algorithm.jgit;
+package com.github.difflib.algorithm.jgit;
 
-import static difflib.DiffUtilsTest.readStringListFromInputStream;
-import difflib.TestConstants;
-import difflib.algorithm.DiffException;
-import difflib.patch.Patch;
-import difflib.patch.PatchFailedException;
+import com.github.difflib.algorithm.jgit.JGitDiff;
+import static com.github.difflib.DiffUtilsTest.readStringListFromInputStream;
+import com.github.difflib.TestConstants;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.Patch;
+import com.github.difflib.patch.PatchFailedException;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/test/java/difflib/algorithm/jgit/LRJGitDiffTest.java b/src/test/java/com/github/difflib/algorithm/jgit/LRJGitDiffTest.java
similarity index 84%
rename from src/test/java/difflib/algorithm/jgit/LRJGitDiffTest.java
rename to src/test/java/com/github/difflib/algorithm/jgit/LRJGitDiffTest.java
index fc95781..795e790 100644
--- a/src/test/java/difflib/algorithm/jgit/LRJGitDiffTest.java
+++ b/src/test/java/com/github/difflib/algorithm/jgit/LRJGitDiffTest.java
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package difflib.algorithm.jgit;
+package com.github.difflib.algorithm.jgit;
 
-import static difflib.DiffUtilsTest.readStringListFromInputStream;
-import difflib.TestConstants;
-import difflib.algorithm.DiffException;
-import difflib.patch.Patch;
-import difflib.patch.PatchFailedException;
+import com.github.difflib.algorithm.jgit.JGitDiff;
+import static com.github.difflib.DiffUtilsTest.readStringListFromInputStream;
+import com.github.difflib.TestConstants;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.Patch;
+import com.github.difflib.patch.PatchFailedException;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/test/java/difflib/algorithm/myers/MyersDiffTest.java b/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
similarity index 88%
rename from src/test/java/difflib/algorithm/myers/MyersDiffTest.java
rename to src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
index b48403f..9e8aae6 100644
--- a/src/test/java/difflib/algorithm/myers/MyersDiffTest.java
+++ b/src/test/java/com/github/difflib/algorithm/myers/MyersDiffTest.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package difflib.algorithm.myers;
+package com.github.difflib.algorithm.myers;
 
-import difflib.DiffUtils;
-import difflib.algorithm.DiffException;
-import difflib.patch.Patch;
+import com.github.difflib.algorithm.myers.MyersDiff;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.Patch;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.After;
diff --git a/src/test/java/difflib/examples/ApplyPatch.java b/src/test/java/com/github/difflib/examples/ApplyPatch.java
similarity index 78%
rename from src/test/java/difflib/examples/ApplyPatch.java
rename to src/test/java/com/github/difflib/examples/ApplyPatch.java
index 06dc8d4..4eca7d3 100644
--- a/src/test/java/difflib/examples/ApplyPatch.java
+++ b/src/test/java/com/github/difflib/examples/ApplyPatch.java
@@ -1,10 +1,10 @@
-package difflib.examples;
+package com.github.difflib.examples;
 
-import difflib.DiffUtils;
-import difflib.TestConstants;
-import difflib.UnifiedDiffUtils;
-import difflib.patch.Patch;
-import difflib.patch.PatchFailedException;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.TestConstants;
+import com.github.difflib.UnifiedDiffUtils;
+import com.github.difflib.patch.Patch;
+import com.github.difflib.patch.PatchFailedException;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/src/test/java/difflib/examples/ComputeDifference.java b/src/test/java/com/github/difflib/examples/ComputeDifference.java
similarity index 77%
rename from src/test/java/difflib/examples/ComputeDifference.java
rename to src/test/java/com/github/difflib/examples/ComputeDifference.java
index 58a343c..82ff019 100644
--- a/src/test/java/difflib/examples/ComputeDifference.java
+++ b/src/test/java/com/github/difflib/examples/ComputeDifference.java
@@ -1,10 +1,10 @@
-package difflib.examples;
+package com.github.difflib.examples;
 
-import difflib.DiffUtils;
-import difflib.TestConstants;
-import difflib.algorithm.DiffException;
-import difflib.patch.Delta;
-import difflib.patch.Patch;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.TestConstants;
+import com.github.difflib.algorithm.DiffException;
+import com.github.difflib.patch.Delta;
+import com.github.difflib.patch.Patch;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/src/test/java/difflib/patch/PatchTest.java b/src/test/java/com/github/difflib/patch/PatchTest.java
similarity index 88%
rename from src/test/java/difflib/patch/PatchTest.java
rename to src/test/java/com/github/difflib/patch/PatchTest.java
index 566d503..cfda69a 100644
--- a/src/test/java/difflib/patch/PatchTest.java
+++ b/src/test/java/com/github/difflib/patch/PatchTest.java
@@ -1,7 +1,9 @@
-package difflib.patch;
+package com.github.difflib.patch;
 
-import difflib.DiffUtils;
-import difflib.algorithm.DiffException;
+import com.github.difflib.patch.Patch;
+import com.github.difflib.patch.PatchFailedException;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.algorithm.DiffException;
 import java.util.Arrays;
 import java.util.List;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/difflib/text/DiffRowGeneratorTest.java b/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
similarity index 98%
rename from src/test/java/difflib/text/DiffRowGeneratorTest.java
rename to src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 37c9a06..a7ddc3d 100644
--- a/src/test/java/difflib/text/DiffRowGeneratorTest.java
+++ b/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -1,6 +1,8 @@
-package difflib.text;
+package com.github.difflib.text;
 
-import difflib.algorithm.DiffException;
+import com.github.difflib.text.DiffRow;
+import com.github.difflib.text.DiffRowGenerator;
+import com.github.difflib.algorithm.DiffException;
 import java.util.Arrays;
 import java.util.List;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/difflib/text/StringUtilsTest.java b/src/test/java/com/github/difflib/text/StringUtilsTest.java
similarity index 96%
rename from src/test/java/difflib/text/StringUtilsTest.java
rename to src/test/java/com/github/difflib/text/StringUtilsTest.java
index 1708c47..1207436 100644
--- a/src/test/java/difflib/text/StringUtilsTest.java
+++ b/src/test/java/com/github/difflib/text/StringUtilsTest.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package difflib.text;
+package com.github.difflib.text;
 
+import com.github.difflib.text.StringUtils;
 import java.util.Collections;
 import org.junit.Test;
 import static org.junit.Assert.*;