Create internal package

21 files changed, 106 insertions, 106 deletions

diff --git a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java
index 95fbe5d..40b6d99 100644
--- a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java
@@ -1,15 +1,15 @@
 package org.zwobble.mammoth.tests;
 
 import org.junit.Test;
-import org.zwobble.mammoth.DocumentConverter;
-import org.zwobble.mammoth.documents.*;
-import org.zwobble.mammoth.html.Html;
-import org.zwobble.mammoth.html.HtmlNode;
+import org.zwobble.mammoth.internal.DocumentConverter;
+import org.zwobble.mammoth.internal.documents.*;
+import org.zwobble.mammoth.internal.html.Html;
+import org.zwobble.mammoth.internal.html.HtmlNode;
 import org.zwobble.mammoth.results.Result;
-import org.zwobble.mammoth.styles.HtmlPath;
-import org.zwobble.mammoth.styles.ParagraphMatcher;
-import org.zwobble.mammoth.styles.RunMatcher;
-import org.zwobble.mammoth.styles.StyleMap;
+import org.zwobble.mammoth.internal.styles.HtmlPath;
+import org.zwobble.mammoth.internal.styles.ParagraphMatcher;
+import org.zwobble.mammoth.internal.styles.RunMatcher;
+import org.zwobble.mammoth.internal.styles.StyleMap;
 
 import java.io.ByteArrayInputStream;
 import java.util.List;
@@ -18,14 +18,14 @@ import java.util.Optional;
 import static com.natpryce.makeiteasy.MakeItEasy.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.zwobble.mammoth.documents.VerticalAlignment.SUBSCRIPT;
-import static org.zwobble.mammoth.documents.VerticalAlignment.SUPERSCRIPT;
+import static org.zwobble.mammoth.internal.documents.VerticalAlignment.SUBSCRIPT;
+import static org.zwobble.mammoth.internal.documents.VerticalAlignment.SUPERSCRIPT;
 import static org.zwobble.mammoth.results.Result.success;
 import static org.zwobble.mammoth.results.Warning.warning;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.*;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class DocumentConverterTests {
     // TODO: styles (paragraph, run)
diff --git a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
index 683251d..9ca658e 100644
--- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
+++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
@@ -2,7 +2,7 @@ package org.zwobble.mammoth.tests.documents;
 
 import com.natpryce.makeiteasy.Instantiator;
 import com.natpryce.makeiteasy.Property;
-import org.zwobble.mammoth.documents.*;
+import org.zwobble.mammoth.internal.documents.*;
 
 import java.util.List;
 import java.util.Optional;
@@ -11,7 +11,7 @@ import static com.natpryce.makeiteasy.MakeItEasy.a;
 import static com.natpryce.makeiteasy.MakeItEasy.make;
 import static com.natpryce.makeiteasy.MakeItEasy.with;
 import static com.natpryce.makeiteasy.Property.newProperty;
-import static org.zwobble.mammoth.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
 
 public class DocumentElementMakers {
     public static final Property<DocumentElement, Optional<Style>> STYLE = newProperty();
diff --git a/src/test/java/org/zwobble/mammoth/tests/documents/StyleTests.java b/src/test/java/org/zwobble/mammoth/tests/documents/StyleTests.java
index 68b07c6..06f6eba 100644
--- a/src/test/java/org/zwobble/mammoth/tests/documents/StyleTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/documents/StyleTests.java
@@ -1,7 +1,7 @@
 package org.zwobble.mammoth.tests.documents;
 
 import org.junit.Test;
-import org.zwobble.mammoth.documents.Style;
+import org.zwobble.mammoth.internal.documents.Style;
 
 import java.util.Optional;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java
index bb77b01..e937acb 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlReaderMakers.java
@@ -2,7 +2,7 @@ package org.zwobble.mammoth.tests.docx;
 
 import com.natpryce.makeiteasy.Instantiator;
 import com.natpryce.makeiteasy.Property;
-import org.zwobble.mammoth.docx.*;
+import org.zwobble.mammoth.internal.docx.*;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
index 8b31452..a35f248 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -5,14 +5,14 @@ import com.natpryce.makeiteasy.Maker;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import org.junit.Test;
-import org.zwobble.mammoth.documents.*;
-import org.zwobble.mammoth.docx.*;
+import org.zwobble.mammoth.internal.documents.*;
+import org.zwobble.mammoth.internal.docx.*;
 import org.zwobble.mammoth.results.Result;
 import org.zwobble.mammoth.results.Warning;
 import org.zwobble.mammoth.tests.DeepReflectionMatcher;
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlNode;
-import org.zwobble.mammoth.xml.XmlNodes;
+import org.zwobble.mammoth.internal.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlNode;
+import org.zwobble.mammoth.internal.xml.XmlNodes;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -27,16 +27,16 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
-import static org.zwobble.mammoth.documents.NoteReference.endnoteReference;
-import static org.zwobble.mammoth.documents.NoteReference.footnoteReference;
+import static org.zwobble.mammoth.internal.documents.NoteReference.endnoteReference;
+import static org.zwobble.mammoth.internal.documents.NoteReference.footnoteReference;
 import static org.zwobble.mammoth.results.Warning.warning;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.*;
 import static org.zwobble.mammoth.tests.docx.BodyXmlReaderMakers.*;
 import static org.zwobble.mammoth.tests.docx.BodyXmlReaderMakers.NUMBERING;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
-import static org.zwobble.mammoth.xml.XmlNodes.element;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class BodyXmlTests {
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java
index 293e3d1..801fd43 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java
@@ -1,16 +1,16 @@
 package org.zwobble.mammoth.tests.docx;
 
 import org.junit.Test;
-import org.zwobble.mammoth.docx.ContentTypes;
-import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.internal.docx.ContentTypes;
+import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
-import static org.zwobble.mammoth.docx.ContentTypesXml.readContentTypesXmlElement;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
-import static org.zwobble.mammoth.xml.XmlNodes.element;
+import static org.zwobble.mammoth.internal.docx.ContentTypesXml.readContentTypesXmlElement;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class ContentTypesXmlTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
index 3eaa4ee..f2c7dda 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
@@ -1,14 +1,14 @@
 package org.zwobble.mammoth.tests.docx;
 
 import org.junit.Test;
-import org.zwobble.mammoth.documents.Document;
-import org.zwobble.mammoth.documents.Note;
-import org.zwobble.mammoth.documents.NoteType;
-import org.zwobble.mammoth.documents.Notes;
-import org.zwobble.mammoth.docx.DocumentXmlReader;
+import org.zwobble.mammoth.internal.documents.Document;
+import org.zwobble.mammoth.internal.documents.Note;
+import org.zwobble.mammoth.internal.documents.NoteType;
+import org.zwobble.mammoth.internal.documents.Notes;
+import org.zwobble.mammoth.internal.docx.DocumentXmlReader;
 import org.zwobble.mammoth.results.Result;
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlNodes;
+import org.zwobble.mammoth.internal.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlNodes;
 
 import static com.natpryce.makeiteasy.MakeItEasy.a;
 import static com.natpryce.makeiteasy.MakeItEasy.make;
@@ -17,8 +17,8 @@ import static org.zwobble.mammoth.results.Result.success;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.paragraphWithText;
 import static org.zwobble.mammoth.tests.docx.BodyXmlReaderMakers.bodyReader;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.xml.XmlNodes.element;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class DocumentXmlTests {
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/InMemoryFileReader.java b/src/test/java/org/zwobble/mammoth/tests/docx/InMemoryFileReader.java
index 7b716cc..8bb7b43 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/InMemoryFileReader.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/InMemoryFileReader.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.zwobble.mammoth.docx.FileReader;
+import org.zwobble.mammoth.internal.docx.FileReader;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java
index a5d5be7..05bb4a7 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java
@@ -1,12 +1,12 @@
 package org.zwobble.mammoth.tests.docx;
 
 import org.junit.Test;
-import org.zwobble.mammoth.documents.NoteType;
+import org.zwobble.mammoth.internal.documents.NoteType;
 import org.zwobble.mammoth.results.Result;
-import org.zwobble.mammoth.documents.Note;
-import org.zwobble.mammoth.docx.BodyXmlReader;
-import org.zwobble.mammoth.docx.NotesXmlReader;
-import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.internal.documents.Note;
+import org.zwobble.mammoth.internal.docx.BodyXmlReader;
+import org.zwobble.mammoth.internal.docx.NotesXmlReader;
+import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.List;
 
@@ -16,9 +16,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.results.Result.success;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.PARAGRAPH;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
-import static org.zwobble.mammoth.xml.XmlNodes.element;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class NotesXmlReaderTests {
     private static final BodyXmlReader bodyReader = make(a(BodyXmlReaderMakers.bodyReader));
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java
index 029a8ce..e55b998 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java
@@ -1,16 +1,16 @@
 package org.zwobble.mammoth.tests.docx;
 
 import org.junit.Test;
-import org.zwobble.mammoth.docx.Numbering;
-import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.internal.docx.Numbering;
+import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
-import static org.zwobble.mammoth.docx.NumberingXml.readNumberingXmlElement;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
-import static org.zwobble.mammoth.xml.XmlNodes.element;
+import static org.zwobble.mammoth.internal.docx.NumberingXml.readNumberingXmlElement;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class NumberingXmlTests {
     private final static XmlElement SAMPLE_NUMBERING_XML = element("w:numbering", list(
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
index ff58f75..bc8eb45 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
@@ -2,15 +2,15 @@ package org.zwobble.mammoth.tests.docx;
 
 import com.google.common.base.Charsets;
 import org.junit.Test;
-import org.zwobble.mammoth.docx.OfficeXml;
-import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.internal.docx.OfficeXml;
+import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.io.ByteArrayInputStream;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.xml.XmlNodes.element;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class OfficeXmlTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
index 58f2bb8..a21c7c8 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
@@ -1,14 +1,14 @@
 package org.zwobble.mammoth.tests.docx;
 
 import org.junit.Test;
-import org.zwobble.mammoth.docx.Relationships;
-import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.internal.docx.Relationships;
+import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import static org.junit.Assert.assertEquals;
-import static org.zwobble.mammoth.docx.RelationshipsXml.readRelationshipsXmlElement;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
-import static org.zwobble.mammoth.xml.XmlNodes.element;
+import static org.zwobble.mammoth.internal.docx.RelationshipsXml.readRelationshipsXmlElement;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class RelationshipsXmlTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
index 6b5de50..9178256 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
@@ -1,16 +1,16 @@
 package org.zwobble.mammoth.tests.docx;
 
 import org.junit.Test;
-import org.zwobble.mammoth.docx.Styles;
-import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.internal.docx.Styles;
+import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
-import static org.zwobble.mammoth.docx.StylesXml.readStylesXmlElement;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
-import static org.zwobble.mammoth.xml.XmlNodes.element;
+import static org.zwobble.mammoth.internal.docx.StylesXml.readStylesXmlElement;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.xml.XmlNodes.element;
 
 public class StylesXmlTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java b/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java
index dfe4f78..29af738 100644
--- a/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java
@@ -1,12 +1,12 @@
 package org.zwobble.mammoth.tests.html;
 
 import org.junit.Test;
-import org.zwobble.mammoth.html.Html;
+import org.zwobble.mammoth.internal.html.Html;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class HtmlCollapseTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java b/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java
index 8f66486..f17dbc7 100644
--- a/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java
@@ -1,11 +1,11 @@
 package org.zwobble.mammoth.tests.html;
 
 import org.junit.Test;
-import org.zwobble.mammoth.html.Html;
+import org.zwobble.mammoth.internal.html.Html;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
-import static org.zwobble.mammoth.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
 
 public class HtmlStripEmptyTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java b/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java
index 2f94776..4dc23cc 100644
--- a/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java
@@ -1,12 +1,12 @@
 package org.zwobble.mammoth.tests.html;
 
 import org.junit.Test;
-import org.zwobble.mammoth.html.Html;
-import org.zwobble.mammoth.html.HtmlNode;
+import org.zwobble.mammoth.internal.html.Html;
+import org.zwobble.mammoth.internal.html.HtmlNode;
 
 import static org.junit.Assert.assertEquals;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class HtmlWriteTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/DocumentMatcherParsingTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/DocumentMatcherParsingTests.java
index 83ad4b6..0a8cf0d 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/DocumentMatcherParsingTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/DocumentMatcherParsingTests.java
@@ -2,10 +2,10 @@ package org.zwobble.mammoth.tests.styles;
 
 import org.junit.Test;
 import org.parboiled.support.Var;
-import org.zwobble.mammoth.styles.ParagraphMatcher;
-import org.zwobble.mammoth.styles.RunMatcher;
-import org.zwobble.mammoth.styles.parsing.Parsing;
-import org.zwobble.mammoth.styles.parsing.StyleMappingParser;
+import org.zwobble.mammoth.internal.styles.ParagraphMatcher;
+import org.zwobble.mammoth.internal.styles.RunMatcher;
+import org.zwobble.mammoth.internal.styles.parsing.Parsing;
+import org.zwobble.mammoth.internal.styles.parsing.StyleMappingParser;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/HtmlPathParsingTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/HtmlPathParsingTests.java
index 04317b6..af2591e 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/HtmlPathParsingTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/HtmlPathParsingTests.java
@@ -2,15 +2,15 @@ package org.zwobble.mammoth.tests.styles;
 
 import org.junit.Test;
 import org.parboiled.support.Var;
-import org.zwobble.mammoth.styles.HtmlPath;
-import org.zwobble.mammoth.styles.HtmlPathElement;
-import org.zwobble.mammoth.styles.parsing.Parsing;
-import org.zwobble.mammoth.styles.parsing.StyleMappingParser;
+import org.zwobble.mammoth.internal.styles.HtmlPath;
+import org.zwobble.mammoth.internal.styles.HtmlPathElement;
+import org.zwobble.mammoth.internal.styles.parsing.Parsing;
+import org.zwobble.mammoth.internal.styles.parsing.StyleMappingParser;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class HtmlPathParsingTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java
index 436dc62..abd195d 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java
@@ -1,10 +1,10 @@
 package org.zwobble.mammoth.tests.styles;
 
 import org.junit.Test;
-import org.zwobble.mammoth.documents.NumberingLevel;
-import org.zwobble.mammoth.documents.Paragraph;
-import org.zwobble.mammoth.documents.Style;
-import org.zwobble.mammoth.styles.ParagraphMatcher;
+import org.zwobble.mammoth.internal.documents.NumberingLevel;
+import org.zwobble.mammoth.internal.documents.Paragraph;
+import org.zwobble.mammoth.internal.documents.Style;
+import org.zwobble.mammoth.internal.styles.ParagraphMatcher;
 
 import java.util.Optional;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/StyleMapParserTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/StyleMapParserTests.java
index 1e6873b..3638e85 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/StyleMapParserTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/StyleMapParserTests.java
@@ -1,11 +1,11 @@
 package org.zwobble.mammoth.tests.styles;
 
 import org.junit.Test;
-import org.zwobble.mammoth.styles.HtmlPath;
-import org.zwobble.mammoth.styles.ParagraphMatcher;
-import org.zwobble.mammoth.styles.RunMatcher;
-import org.zwobble.mammoth.styles.StyleMap;
-import org.zwobble.mammoth.styles.parsing.StyleMapParser;
+import org.zwobble.mammoth.internal.styles.HtmlPath;
+import org.zwobble.mammoth.internal.styles.ParagraphMatcher;
+import org.zwobble.mammoth.internal.styles.RunMatcher;
+import org.zwobble.mammoth.internal.styles.StyleMap;
+import org.zwobble.mammoth.internal.styles.parsing.StyleMapParser;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
diff --git a/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java b/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
index a14688f..7e8cc09 100644
--- a/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
@@ -5,10 +5,10 @@ import org.hamcrest.Matcher;
 import org.hamcrest.collection.IsEmptyIterable;
 import org.hamcrest.collection.IsIterableContainingInOrder;
 import org.junit.Test;
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlNode;
-import org.zwobble.mammoth.xml.XmlTextNode;
-import org.zwobble.mammoth.xml.parsing.XmlParser;
+import org.zwobble.mammoth.internal.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlNode;
+import org.zwobble.mammoth.internal.xml.XmlTextNode;
+import org.zwobble.mammoth.internal.xml.parsing.XmlParser;
 
 import java.io.ByteArrayInputStream;
 import java.util.List;
@@ -16,8 +16,8 @@ import java.util.Map;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class XmlParserTests {
     private final XmlParser parser = new XmlParser(ImmutableBiMap.of());