107 files changed, 303 insertions, 302 deletions

diff --git a/src/main/java/org/zwobble/mammoth/Mammoth.java b/src/main/java/org/zwobble/mammoth/Mammoth.java
index b00d5ca..9e9af83 100644
--- a/src/main/java/org/zwobble/mammoth/Mammoth.java
+++ b/src/main/java/org/zwobble/mammoth/Mammoth.java
@@ -3,18 +3,19 @@ package org.zwobble.mammoth;
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import org.zwobble.mammoth.documents.DocumentElement;
-import org.zwobble.mammoth.documents.HasChildren;
-import org.zwobble.mammoth.documents.Paragraph;
-import org.zwobble.mammoth.documents.Text;
-import org.zwobble.mammoth.docx.DocxFile;
-import org.zwobble.mammoth.docx.InMemoryDocxFile;
-import org.zwobble.mammoth.docx.ZippedDocxFile;
-import org.zwobble.mammoth.html.Html;
+import org.zwobble.mammoth.internal.DocumentConverter;
+import org.zwobble.mammoth.internal.documents.DocumentElement;
+import org.zwobble.mammoth.internal.documents.HasChildren;
+import org.zwobble.mammoth.internal.documents.Paragraph;
+import org.zwobble.mammoth.internal.documents.Text;
+import org.zwobble.mammoth.internal.docx.DocxFile;
+import org.zwobble.mammoth.internal.docx.InMemoryDocxFile;
+import org.zwobble.mammoth.internal.docx.ZippedDocxFile;
+import org.zwobble.mammoth.internal.html.Html;
 import org.zwobble.mammoth.results.Result;
-import org.zwobble.mammoth.styles.*;
-import org.zwobble.mammoth.styles.parsing.StyleMapParser;
-import org.zwobble.mammoth.util.Casts;
+import org.zwobble.mammoth.internal.styles.*;
+import org.zwobble.mammoth.internal.styles.parsing.StyleMapParser;
+import org.zwobble.mammoth.internal.util.Casts;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,8 +25,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.zip.ZipFile;
 
-import static org.zwobble.mammoth.docx.DocumentReader.readDocument;
-import static org.zwobble.mammoth.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.docx.DocumentReader.readDocument;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
 
 public class Mammoth {
     public static class Options {
diff --git a/src/main/java/org/zwobble/mammoth/documents/Documents.java b/src/main/java/org/zwobble/mammoth/documents/Documents.java
deleted file mode 100644
index b599c51..0000000
--- a/src/main/java/org/zwobble/mammoth/documents/Documents.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.zwobble.mammoth.documents;
-
-public class Documents {
-}
diff --git a/src/main/java/org/zwobble/mammoth/DocumentConverter.java b/src/main/java/org/zwobble/mammoth/internal/DocumentConverter.java
index 0cf100c..5aa3c08 100644
--- a/src/main/java/org/zwobble/mammoth/DocumentConverter.java
+++ b/src/main/java/org/zwobble/mammoth/internal/DocumentConverter.java
@@ -1,17 +1,17 @@
-package org.zwobble.mammoth;
+package org.zwobble.mammoth.internal;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.io.ByteStreams;
-import org.zwobble.mammoth.documents.*;
-import org.zwobble.mammoth.html.Html;
-import org.zwobble.mammoth.html.HtmlNode;
+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.results.Warning;
-import org.zwobble.mammoth.styles.HtmlPath;
-import org.zwobble.mammoth.styles.StyleMap;
-import org.zwobble.mammoth.util.MammothLists;
+import org.zwobble.mammoth.internal.styles.HtmlPath;
+import org.zwobble.mammoth.internal.styles.StyleMap;
+import org.zwobble.mammoth.internal.util.MammothLists;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -20,8 +20,8 @@ import java.util.List;
 import java.util.Map;
 
 import static org.zwobble.mammoth.results.Warning.warning;
-import static org.zwobble.mammoth.util.MammothLists.*;
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothLists.*;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class DocumentConverter {
     public static Result<List<HtmlNode>> convertToHtml(String idPrefix, boolean preserveEmptyParagraphs, StyleMap styleMap, Document document) {
diff --git a/src/main/java/org/zwobble/mammoth/documents/Bookmark.java b/src/main/java/org/zwobble/mammoth/internal/documents/Bookmark.java
index 81a4ce4..cca6317 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Bookmark.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Bookmark.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 public class Bookmark implements DocumentElement {
     private final String name;
diff --git a/src/main/java/org/zwobble/mammoth/documents/Document.java b/src/main/java/org/zwobble/mammoth/internal/documents/Document.java
index c3a14d3..447d6ed 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Document.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Document.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import java.util.List;
 
diff --git a/src/main/java/org/zwobble/mammoth/documents/DocumentElement.java b/src/main/java/org/zwobble/mammoth/internal/documents/DocumentElement.java
index fd3990c..b3360ed 100644
--- a/src/main/java/org/zwobble/mammoth/documents/DocumentElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/DocumentElement.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 public interface DocumentElement {
     <T> T accept(DocumentElementVisitor<T> visitor);
diff --git a/src/main/java/org/zwobble/mammoth/documents/DocumentElementVisitor.java b/src/main/java/org/zwobble/mammoth/internal/documents/DocumentElementVisitor.java
index 6874e87..569a525 100644
--- a/src/main/java/org/zwobble/mammoth/documents/DocumentElementVisitor.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/DocumentElementVisitor.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 public interface DocumentElementVisitor<T> {
     T visit(Paragraph paragraph);
diff --git a/src/main/java/org/zwobble/mammoth/internal/documents/Documents.java b/src/main/java/org/zwobble/mammoth/internal/documents/Documents.java
new file mode 100644
index 0000000..64a5d1c
--- /dev/null
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Documents.java
@@ -0,0 +1,4 @@
+package org.zwobble.mammoth.internal.documents;
+
+public class Documents {
+}
diff --git a/src/main/java/org/zwobble/mammoth/documents/HasChildren.java b/src/main/java/org/zwobble/mammoth/internal/documents/HasChildren.java
index cfd6c44..2a5280e 100644
--- a/src/main/java/org/zwobble/mammoth/documents/HasChildren.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/HasChildren.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import java.util.List;
 
diff --git a/src/main/java/org/zwobble/mammoth/documents/Hyperlink.java b/src/main/java/org/zwobble/mammoth/internal/documents/Hyperlink.java
index 9b2b920..ceb558f 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Hyperlink.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Hyperlink.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/org/zwobble/mammoth/documents/Image.java b/src/main/java/org/zwobble/mammoth/internal/documents/Image.java
index 8022ea4..8ceee7c 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Image.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Image.java
@@ -1,6 +1,6 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
-import org.zwobble.mammoth.util.InputStreamSupplier;
+import org.zwobble.mammoth.internal.util.InputStreamSupplier;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/zwobble/mammoth/documents/LineBreak.java b/src/main/java/org/zwobble/mammoth/internal/documents/LineBreak.java
index 23253df..00b2a06 100644
--- a/src/main/java/org/zwobble/mammoth/documents/LineBreak.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/LineBreak.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 public class LineBreak implements DocumentElement {
     public static final LineBreak LINE_BREAK = new LineBreak();
diff --git a/src/main/java/org/zwobble/mammoth/documents/Note.java b/src/main/java/org/zwobble/mammoth/internal/documents/Note.java
index 75c28c6..d7d741b 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Note.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Note.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import java.util.List;
 
diff --git a/src/main/java/org/zwobble/mammoth/documents/NoteReference.java b/src/main/java/org/zwobble/mammoth/internal/documents/NoteReference.java
index 11190c3..7d0beb2 100644
--- a/src/main/java/org/zwobble/mammoth/documents/NoteReference.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/NoteReference.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 public class NoteReference implements DocumentElement {
     public static NoteReference footnoteReference(String noteId) {
diff --git a/src/main/java/org/zwobble/mammoth/documents/NoteType.java b/src/main/java/org/zwobble/mammoth/internal/documents/NoteType.java
index 02549d8..47defc1 100644
--- a/src/main/java/org/zwobble/mammoth/documents/NoteType.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/NoteType.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 public enum NoteType {
     FOOTNOTE,
diff --git a/src/main/java/org/zwobble/mammoth/documents/Notes.java b/src/main/java/org/zwobble/mammoth/internal/documents/Notes.java
index 2959bb0..d8ca28d 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Notes.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Notes.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimaps;
@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
 
 public class Notes {
     public final static Notes EMPTY = new Notes(list());
diff --git a/src/main/java/org/zwobble/mammoth/documents/NumberingLevel.java b/src/main/java/org/zwobble/mammoth/internal/documents/NumberingLevel.java
index 9baa3fc..592d96f 100644
--- a/src/main/java/org/zwobble/mammoth/documents/NumberingLevel.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/NumberingLevel.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 public class NumberingLevel {
     public static NumberingLevel ordered(String levelIndex) {
diff --git a/src/main/java/org/zwobble/mammoth/documents/Paragraph.java b/src/main/java/org/zwobble/mammoth/internal/documents/Paragraph.java
index 8490d33..66ea009 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Paragraph.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Paragraph.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/org/zwobble/mammoth/documents/Run.java b/src/main/java/org/zwobble/mammoth/internal/documents/Run.java
index c747d2e..61f865f 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Run.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Run.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/org/zwobble/mammoth/documents/Style.java b/src/main/java/org/zwobble/mammoth/internal/documents/Style.java
index 2ce6edf..2d7805c 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Style.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Style.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/zwobble/mammoth/documents/Tab.java b/src/main/java/org/zwobble/mammoth/internal/documents/Tab.java
index 693f5f6..b977d12 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Tab.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Tab.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 public class Tab implements DocumentElement {
     public static final Tab TAB = new Tab();
diff --git a/src/main/java/org/zwobble/mammoth/documents/Table.java b/src/main/java/org/zwobble/mammoth/internal/documents/Table.java
index ceac458..7381c7d 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Table.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Table.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import java.util.List;
 
diff --git a/src/main/java/org/zwobble/mammoth/documents/TableCell.java b/src/main/java/org/zwobble/mammoth/internal/documents/TableCell.java
index a7a4f59..f0ce7be 100644
--- a/src/main/java/org/zwobble/mammoth/documents/TableCell.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/TableCell.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import java.util.List;
 
diff --git a/src/main/java/org/zwobble/mammoth/documents/TableRow.java b/src/main/java/org/zwobble/mammoth/internal/documents/TableRow.java
index b5ab320..9450c88 100644
--- a/src/main/java/org/zwobble/mammoth/documents/TableRow.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/TableRow.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 import java.util.List;
 
diff --git a/src/main/java/org/zwobble/mammoth/documents/Text.java b/src/main/java/org/zwobble/mammoth/internal/documents/Text.java
index 20a7d6e..64123e9 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Text.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/Text.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 public class Text implements DocumentElement {
     private final String value;
diff --git a/src/main/java/org/zwobble/mammoth/documents/VerticalAlignment.java b/src/main/java/org/zwobble/mammoth/internal/documents/VerticalAlignment.java
index cb6cf93..5957e8f 100644
--- a/src/main/java/org/zwobble/mammoth/documents/VerticalAlignment.java
+++ b/src/main/java/org/zwobble/mammoth/internal/documents/VerticalAlignment.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.documents;
+package org.zwobble.mammoth.internal.documents;
 
 public enum VerticalAlignment {
     SUPERSCRIPT,
diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
index 9a1f95b..43a275a 100644
--- a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java
@@ -1,15 +1,15 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
 import com.google.common.collect.ImmutableSet;
-import org.zwobble.mammoth.documents.*;
+import org.zwobble.mammoth.internal.documents.*;
 import org.zwobble.mammoth.results.Result;
 import org.zwobble.mammoth.results.Warning;
-import org.zwobble.mammoth.util.InputStreamSupplier;
-import org.zwobble.mammoth.util.MammothOptionals;
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlElementLike;
-import org.zwobble.mammoth.xml.XmlElementList;
-import org.zwobble.mammoth.xml.XmlNode;
+import org.zwobble.mammoth.internal.util.InputStreamSupplier;
+import org.zwobble.mammoth.internal.util.MammothOptionals;
+import org.zwobble.mammoth.internal.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlElementLike;
+import org.zwobble.mammoth.internal.xml.XmlElementList;
+import org.zwobble.mammoth.internal.xml.XmlNode;
 
 import java.util.Optional;
 import java.util.Set;
@@ -17,11 +17,11 @@ import java.util.function.Function;
 
 import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Iterables.transform;
-import static org.zwobble.mammoth.docx.ReadResult.EMPTY_SUCCESS;
-import static org.zwobble.mammoth.docx.ReadResult.success;
+import static org.zwobble.mammoth.internal.docx.ReadResult.EMPTY_SUCCESS;
+import static org.zwobble.mammoth.internal.docx.ReadResult.success;
 import static org.zwobble.mammoth.results.Warning.warning;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothStrings.trimLeft;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothStrings.trimLeft;
 
 public class BodyXmlReader {
     private static final Set<String> IMAGE_TYPES_SUPPORTED_BY_BROWSERS = ImmutableSet.of(
diff --git a/src/main/java/org/zwobble/mammoth/docx/ContentTypes.java b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
index 81c3c1a..ce4ebac 100644
--- a/src/main/java/org/zwobble/mammoth/docx/ContentTypes.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
@@ -6,7 +6,7 @@ import com.google.common.io.Files;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class ContentTypes {
     public static final ContentTypes DEFAULT = new ContentTypes(map(), map());
diff --git a/src/main/java/org/zwobble/mammoth/docx/ContentTypesXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
index afcc6c0..4a7d3bd 100644
--- a/src/main/java/org/zwobble/mammoth/docx/ContentTypesXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypesXml.java
@@ -1,13 +1,13 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlElementList;
+import org.zwobble.mammoth.internal.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlElementList;
 
 import java.util.Map;
 
 import static com.google.common.collect.Maps.immutableEntry;
-import static org.zwobble.mammoth.util.MammothMaps.toMap;
-import static org.zwobble.mammoth.util.MammothStrings.trimLeft;
+import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
+import static org.zwobble.mammoth.internal.util.MammothStrings.trimLeft;
 
 public class ContentTypesXml {
     public static ContentTypes readContentTypesXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
index 1fc0fc8..4341bbf 100644
--- a/src/main/java/org/zwobble/mammoth/docx/DocumentReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
@@ -1,10 +1,10 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
-import org.zwobble.mammoth.documents.Document;
-import org.zwobble.mammoth.documents.Notes;
+import org.zwobble.mammoth.internal.documents.Document;
+import org.zwobble.mammoth.internal.documents.Notes;
 import org.zwobble.mammoth.results.Result;
-import org.zwobble.mammoth.util.MammothLists;
-import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.internal.util.MammothLists;
+import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,7 +13,7 @@ import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
 
 public class DocumentReader {
     @FunctionalInterface
diff --git a/src/main/java/org/zwobble/mammoth/docx/DocumentXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
index 5e94e2f..3c215fe 100644
--- a/src/main/java/org/zwobble/mammoth/docx/DocumentXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentXmlReader.java
@@ -1,9 +1,9 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
-import org.zwobble.mammoth.documents.Document;
-import org.zwobble.mammoth.documents.Notes;
+import org.zwobble.mammoth.internal.documents.Document;
+import org.zwobble.mammoth.internal.documents.Notes;
 import org.zwobble.mammoth.results.Result;
-import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlElement;
 
 public class DocumentXmlReader {
     private final BodyXmlReader bodyReader;
diff --git a/src/main/java/org/zwobble/mammoth/docx/DocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocxFile.java
index 0ef8c23..8e73a04 100644
--- a/src/main/java/org/zwobble/mammoth/docx/DocxFile.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocxFile.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/src/main/java/org/zwobble/mammoth/docx/FileReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/FileReader.java
index 9bb5b25..f25eb32 100644
--- a/src/main/java/org/zwobble/mammoth/docx/FileReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/FileReader.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/zwobble/mammoth/docx/InMemoryDocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
index 3c6d4b4..7229ad5 100644
--- a/src/main/java/org/zwobble/mammoth/docx/InMemoryDocxFile.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
diff --git a/src/main/java/org/zwobble/mammoth/docx/NotesXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
index d3c6532..2e31aa2 100644
--- a/src/main/java/org/zwobble/mammoth/docx/NotesXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NotesXmlReader.java
@@ -1,9 +1,9 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
-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.xml.XmlElement;
+import org.zwobble.mammoth.internal.documents.Note;
+import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.List;
 
diff --git a/src/main/java/org/zwobble/mammoth/docx/Numbering.java b/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
index 2f381dc..f61b5db 100644
--- a/src/main/java/org/zwobble/mammoth/docx/Numbering.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
@@ -1,11 +1,11 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
-import org.zwobble.mammoth.documents.NumberingLevel;
+import org.zwobble.mammoth.internal.documents.NumberingLevel;
 
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class Numbering {
     public static final Numbering EMPTY = new Numbering(map());
diff --git a/src/main/java/org/zwobble/mammoth/docx/NumberingXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
index 9c3e286..0ee480d 100644
--- a/src/main/java/org/zwobble/mammoth/docx/NumberingXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
@@ -1,14 +1,14 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
-import org.zwobble.mammoth.documents.NumberingLevel;
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlElementList;
+import org.zwobble.mammoth.internal.documents.NumberingLevel;
+import org.zwobble.mammoth.internal.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlElementList;
 
 import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.collect.Maps.immutableEntry;
-import static org.zwobble.mammoth.util.MammothMaps.toMap;
+import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
 
 public class NumberingXml {
     public static Numbering readNumberingXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/docx/OfficeXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
index 43d86ad..2b5c279 100644
--- a/src/main/java/org/zwobble/mammoth/docx/OfficeXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/OfficeXml.java
@@ -1,19 +1,19 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlNode;
-import org.zwobble.mammoth.xml.XmlNodeVisitor;
-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.XmlNodeVisitor;
+import org.zwobble.mammoth.internal.xml.XmlTextNode;
+import org.zwobble.mammoth.internal.xml.parsing.XmlParser;
 
 import java.io.InputStream;
 import java.util.List;
 
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Iterables.transform;
-import static org.zwobble.mammoth.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
 
 public class OfficeXml {
     private static ImmutableBiMap<String, String> XML_NAMESPACES = ImmutableBiMap.<String, String>builder()
diff --git a/src/main/java/org/zwobble/mammoth/docx/ReadResult.java b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
index 69c4d1b..366fd12 100644
--- a/src/main/java/org/zwobble/mammoth/docx/ReadResult.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ReadResult.java
@@ -1,7 +1,7 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
 import com.google.common.collect.ImmutableList;
-import org.zwobble.mammoth.documents.DocumentElement;
+import org.zwobble.mammoth.internal.documents.DocumentElement;
 import org.zwobble.mammoth.results.Result;
 import org.zwobble.mammoth.results.Warning;
 
@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import static org.zwobble.mammoth.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
 
 public class ReadResult {
     public static final ReadResult EMPTY_SUCCESS = success(list());
diff --git a/src/main/java/org/zwobble/mammoth/docx/Relationship.java b/src/main/java/org/zwobble/mammoth/internal/docx/Relationship.java
index 4d469d7..dacd7a6 100644
--- a/src/main/java/org/zwobble/mammoth/docx/Relationship.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Relationship.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
 public class Relationship {
     private final String target;
diff --git a/src/main/java/org/zwobble/mammoth/docx/Relationships.java b/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
index f23ed85..d019b57 100644
--- a/src/main/java/org/zwobble/mammoth/docx/Relationships.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
@@ -1,9 +1,9 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class Relationships {
     public static final Relationships EMPTY = new Relationships(map());
diff --git a/src/main/java/org/zwobble/mammoth/docx/RelationshipsXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
index 550eed0..938776e 100644
--- a/src/main/java/org/zwobble/mammoth/docx/RelationshipsXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/RelationshipsXml.java
@@ -1,11 +1,11 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
-import org.zwobble.mammoth.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.Map;
 
 import static com.google.common.collect.Maps.immutableEntry;
-import static org.zwobble.mammoth.util.MammothMaps.toMap;
+import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
 
 public class RelationshipsXml {
     public static Relationships readRelationshipsXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/docx/Styles.java b/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
index 8784ee2..d5e32e8 100644
--- a/src/main/java/org/zwobble/mammoth/docx/Styles.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
@@ -1,11 +1,11 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
-import org.zwobble.mammoth.documents.Style;
+import org.zwobble.mammoth.internal.documents.Style;
 
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class Styles {
     public static final Styles EMPTY = new Styles(map(), map());
diff --git a/src/main/java/org/zwobble/mammoth/docx/StylesXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
index f7a955d..78ba65f 100644
--- a/src/main/java/org/zwobble/mammoth/docx/StylesXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/StylesXml.java
@@ -1,15 +1,15 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
-import org.zwobble.mammoth.documents.Style;
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlElementList;
+import org.zwobble.mammoth.internal.documents.Style;
+import org.zwobble.mammoth.internal.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlElementList;
 
 import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Maps.immutableEntry;
-import static org.zwobble.mammoth.util.MammothMaps.toMap;
+import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
 
 public class StylesXml {
     public static Styles readStylesXmlElement(XmlElement element) {
diff --git a/src/main/java/org/zwobble/mammoth/docx/ZippedDocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/ZippedDocxFile.java
index c69c147..d263578 100644
--- a/src/main/java/org/zwobble/mammoth/docx/ZippedDocxFile.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ZippedDocxFile.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.docx;
+package org.zwobble.mammoth.internal.docx;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/zwobble/mammoth/html/Html.java b/src/main/java/org/zwobble/mammoth/internal/html/Html.java
index e1bcef7..12ac11e 100644
--- a/src/main/java/org/zwobble/mammoth/html/Html.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/Html.java
@@ -1,16 +1,16 @@
-package org.zwobble.mammoth.html;
+package org.zwobble.mammoth.internal.html;
 
-import org.zwobble.mammoth.util.MammothLists;
-import org.zwobble.mammoth.util.MammothOptionals;
+import org.zwobble.mammoth.internal.util.MammothLists;
+import org.zwobble.mammoth.internal.util.MammothOptionals;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static org.zwobble.mammoth.util.Casts.tryCast;
-import static org.zwobble.mammoth.util.MammothIterables.tryGetLast;
-import static org.zwobble.mammoth.util.MammothLists.list;
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.Casts.tryCast;
+import static org.zwobble.mammoth.internal.util.MammothIterables.tryGetLast;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class Html {
     public static final HtmlNode FORCE_WRITE = HtmlForceWrite.FORCE_WRITE;
diff --git a/src/main/java/org/zwobble/mammoth/html/HtmlElement.java b/src/main/java/org/zwobble/mammoth/internal/html/HtmlElement.java
index b6dab22..c95f40e 100644
--- a/src/main/java/org/zwobble/mammoth/html/HtmlElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/HtmlElement.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.html;
+package org.zwobble.mammoth.internal.html;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/org/zwobble/mammoth/html/HtmlForceWrite.java b/src/main/java/org/zwobble/mammoth/internal/html/HtmlForceWrite.java
index f704fd9..4b3d4bc 100644
--- a/src/main/java/org/zwobble/mammoth/html/HtmlForceWrite.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/HtmlForceWrite.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.html;
+package org.zwobble.mammoth.internal.html;
 
 public class HtmlForceWrite implements HtmlNode {
     public static final HtmlForceWrite FORCE_WRITE = new HtmlForceWrite();
diff --git a/src/main/java/org/zwobble/mammoth/html/HtmlNode.java b/src/main/java/org/zwobble/mammoth/internal/html/HtmlNode.java
index 6099519..a04b57f 100644
--- a/src/main/java/org/zwobble/mammoth/html/HtmlNode.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/HtmlNode.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.html;
+package org.zwobble.mammoth.internal.html;
 
 public interface HtmlNode {
     // TODO: rename visit to accept
diff --git a/src/main/java/org/zwobble/mammoth/html/HtmlSelfClosingElement.java b/src/main/java/org/zwobble/mammoth/internal/html/HtmlSelfClosingElement.java
index 62bfd73..adff96f 100644
--- a/src/main/java/org/zwobble/mammoth/html/HtmlSelfClosingElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/HtmlSelfClosingElement.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.html;
+package org.zwobble.mammoth.internal.html;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/zwobble/mammoth/html/HtmlTextNode.java b/src/main/java/org/zwobble/mammoth/internal/html/HtmlTextNode.java
index a9f9fd5..c26bd33 100644
--- a/src/main/java/org/zwobble/mammoth/html/HtmlTextNode.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/HtmlTextNode.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.html;
+package org.zwobble.mammoth.internal.html;
 
 public class HtmlTextNode implements HtmlNode {
     private final String value;
diff --git a/src/main/java/org/zwobble/mammoth/html/HtmlWriter.java b/src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java
index 4174918..164eefc 100644
--- a/src/main/java/org/zwobble/mammoth/html/HtmlWriter.java
+++ b/src/main/java/org/zwobble/mammoth/internal/html/HtmlWriter.java
@@ -1,8 +1,8 @@
-package org.zwobble.mammoth.html;
+package org.zwobble.mammoth.internal.html;
 
 import java.util.Map;
 
-import static org.zwobble.mammoth.util.MammothLists.orderedBy;
+import static org.zwobble.mammoth.internal.util.MammothLists.orderedBy;
 
 public class HtmlWriter {
     public static void write(HtmlNode node, StringBuilder builder) {
diff --git a/src/main/java/org/zwobble/mammoth/styles/DocumentElementMatcher.java b/src/main/java/org/zwobble/mammoth/internal/styles/DocumentElementMatcher.java
index 19d5be5..697926c 100644
--- a/src/main/java/org/zwobble/mammoth/styles/DocumentElementMatcher.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/DocumentElementMatcher.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.styles;
+package org.zwobble.mammoth.internal.styles;
 
 public interface DocumentElementMatcher<T> {
     boolean matches(T element);
diff --git a/src/main/java/org/zwobble/mammoth/styles/DocumentElementMatching.java b/src/main/java/org/zwobble/mammoth/internal/styles/DocumentElementMatching.java
index 0ed00fc..a0c5aec 100644
--- a/src/main/java/org/zwobble/mammoth/styles/DocumentElementMatching.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/DocumentElementMatching.java
@@ -1,6 +1,6 @@
-package org.zwobble.mammoth.styles;
+package org.zwobble.mammoth.internal.styles;
 
-import org.zwobble.mammoth.documents.Style;
+import org.zwobble.mammoth.internal.documents.Style;
 
 import java.util.Optional;
 import java.util.function.BiPredicate;
diff --git a/src/main/java/org/zwobble/mammoth/styles/HtmlPath.java b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPath.java
index 93fd0fa..a20043a 100644
--- a/src/main/java/org/zwobble/mammoth/styles/HtmlPath.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPath.java
@@ -1,13 +1,13 @@
-package org.zwobble.mammoth.styles;
+package org.zwobble.mammoth.internal.styles;
 
 import com.google.common.collect.Lists;
-import org.zwobble.mammoth.html.HtmlNode;
+import org.zwobble.mammoth.internal.html.HtmlNode;
 
 import java.util.List;
 import java.util.Map;
 
-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 HtmlPath {
     public static final HtmlPath EMPTY = new HtmlPath(list());
diff --git a/src/main/java/org/zwobble/mammoth/styles/HtmlPathElement.java b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java
index e503766..7f110a4 100644
--- a/src/main/java/org/zwobble/mammoth/styles/HtmlPathElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/HtmlPathElement.java
@@ -1,13 +1,13 @@
-package org.zwobble.mammoth.styles;
+package org.zwobble.mammoth.internal.styles;
 
-import org.zwobble.mammoth.html.HtmlElement;
-import org.zwobble.mammoth.html.HtmlNode;
+import org.zwobble.mammoth.internal.html.HtmlElement;
+import org.zwobble.mammoth.internal.html.HtmlNode;
 
 import java.util.List;
 import java.util.Map;
 
-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 HtmlPathElement {
     public static HtmlPathElement fresh(String tagName) {
diff --git a/src/main/java/org/zwobble/mammoth/styles/ParagraphMatcher.java b/src/main/java/org/zwobble/mammoth/internal/styles/ParagraphMatcher.java
index 395a20b..50d5df9 100644
--- a/src/main/java/org/zwobble/mammoth/styles/ParagraphMatcher.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/ParagraphMatcher.java
@@ -1,7 +1,7 @@
-package org.zwobble.mammoth.styles;
+package org.zwobble.mammoth.internal.styles;
 
-import org.zwobble.mammoth.documents.NumberingLevel;
-import org.zwobble.mammoth.documents.Paragraph;
+import org.zwobble.mammoth.internal.documents.NumberingLevel;
+import org.zwobble.mammoth.internal.documents.Paragraph;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/zwobble/mammoth/styles/RunMatcher.java b/src/main/java/org/zwobble/mammoth/internal/styles/RunMatcher.java
index f0078ce..93b50dd 100644
--- a/src/main/java/org/zwobble/mammoth/styles/RunMatcher.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/RunMatcher.java
@@ -1,6 +1,6 @@
-package org.zwobble.mammoth.styles;
+package org.zwobble.mammoth.internal.styles;
 
-import org.zwobble.mammoth.documents.Run;
+import org.zwobble.mammoth.internal.documents.Run;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/zwobble/mammoth/styles/StyleMap.java b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
index d214acb..7d28bf1 100644
--- a/src/main/java/org/zwobble/mammoth/styles/StyleMap.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMap.java
@@ -1,8 +1,8 @@
-package org.zwobble.mammoth.styles;
+package org.zwobble.mammoth.internal.styles;
 
 import com.google.common.collect.Iterables;
-import org.zwobble.mammoth.documents.Paragraph;
-import org.zwobble.mammoth.documents.Run;
+import org.zwobble.mammoth.internal.documents.Paragraph;
+import org.zwobble.mammoth.internal.documents.Run;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/org/zwobble/mammoth/styles/StyleMapBuilder.java b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java
index cdc3f31..6300d29 100644
--- a/src/main/java/org/zwobble/mammoth/styles/StyleMapBuilder.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapBuilder.java
@@ -1,8 +1,8 @@
-package org.zwobble.mammoth.styles;
+package org.zwobble.mammoth.internal.styles;
 
 import com.google.common.collect.ImmutableList;
-import org.zwobble.mammoth.documents.Paragraph;
-import org.zwobble.mammoth.documents.Run;
+import org.zwobble.mammoth.internal.documents.Paragraph;
+import org.zwobble.mammoth.internal.documents.Run;
 
 public class StyleMapBuilder {
     private HtmlPath underline;
diff --git a/src/main/java/org/zwobble/mammoth/styles/StyleMapping.java b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapping.java
index c94d1aa..5512c22 100644
--- a/src/main/java/org/zwobble/mammoth/styles/StyleMapping.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/StyleMapping.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.styles;
+package org.zwobble.mammoth.internal.styles;
 
 public class StyleMapping<T> {
     private final DocumentElementMatcher<T> matcher;
diff --git a/src/main/java/org/zwobble/mammoth/styles/parsing/ListVar.java b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/ListVar.java
index e23acf8..74b3dbc 100644
--- a/src/main/java/org/zwobble/mammoth/styles/parsing/ListVar.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/ListVar.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.styles.parsing;
+package org.zwobble.mammoth.internal.styles.parsing;
 
 
 import com.google.common.collect.ImmutableList;
@@ -6,7 +6,7 @@ import org.parboiled.support.Var;
 
 import java.util.List;
 
-import static org.zwobble.mammoth.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
 
 class ListVar<T> extends Var<ImmutableList.Builder<T>> {
     boolean append(Var<T> element) {
diff --git a/src/main/java/org/zwobble/mammoth/styles/parsing/Parsing.java b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/Parsing.java
index 8971f8a..bef3c0b 100644
--- a/src/main/java/org/zwobble/mammoth/styles/parsing/Parsing.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/Parsing.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.styles.parsing;
+package org.zwobble.mammoth.internal.styles.parsing;
 
 import org.parboiled.BaseParser;
 import org.parboiled.Parboiled;
diff --git a/src/main/java/org/zwobble/mammoth/styles/parsing/StyleMapParser.java b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMapParser.java
index ab453cd..b43e300 100644
--- a/src/main/java/org/zwobble/mammoth/styles/parsing/StyleMapParser.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMapParser.java
@@ -1,8 +1,8 @@
-package org.zwobble.mammoth.styles.parsing;
+package org.zwobble.mammoth.internal.styles.parsing;
 
 import org.parboiled.support.Var;
-import org.zwobble.mammoth.styles.StyleMap;
-import org.zwobble.mammoth.styles.StyleMapBuilder;
+import org.zwobble.mammoth.internal.styles.StyleMap;
+import org.zwobble.mammoth.internal.styles.StyleMapBuilder;
 
 import java.util.List;
 
diff --git a/src/main/java/org/zwobble/mammoth/styles/parsing/StyleMappingParser.java b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingParser.java
index 73b547f..5c1500c 100644
--- a/src/main/java/org/zwobble/mammoth/styles/parsing/StyleMappingParser.java
+++ b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/StyleMappingParser.java
@@ -1,18 +1,18 @@
-package org.zwobble.mammoth.styles.parsing;
+package org.zwobble.mammoth.internal.styles.parsing;
 
 import org.parboiled.Action;
 import org.parboiled.BaseParser;
 import org.parboiled.Context;
 import org.parboiled.Rule;
 import org.parboiled.support.Var;
-import org.zwobble.mammoth.documents.NumberingLevel;
-import org.zwobble.mammoth.styles.*;
+import org.zwobble.mammoth.internal.documents.NumberingLevel;
+import org.zwobble.mammoth.internal.styles.*;
 
 import java.math.BigInteger;
 import java.util.Optional;
 import java.util.function.BiFunction;
 
-import static org.zwobble.mammoth.util.MammothMaps.map;
+import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class StyleMappingParser extends BaseParser<StyleMapBuilder> {
     Rule StyleMapping(Var<StyleMapBuilder> styleMap) {
diff --git a/src/main/java/org/zwobble/mammoth/util/Casts.java b/src/main/java/org/zwobble/mammoth/internal/util/Casts.java
index 0925990..6c48ca8 100644
--- a/src/main/java/org/zwobble/mammoth/util/Casts.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/Casts.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.util;
+package org.zwobble.mammoth.internal.util;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/zwobble/mammoth/util/InputStreamSupplier.java b/src/main/java/org/zwobble/mammoth/internal/util/InputStreamSupplier.java
index 0f42389..012b0d3 100644
--- a/src/main/java/org/zwobble/mammoth/util/InputStreamSupplier.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/InputStreamSupplier.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.util;
+package org.zwobble.mammoth.internal.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/zwobble/mammoth/util/MammothIterables.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java
index 89caf61..cd28c14 100644
--- a/src/main/java/org/zwobble/mammoth/util/MammothIterables.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothIterables.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.util;
+package org.zwobble.mammoth.internal.util;
 
 import com.google.common.collect.Iterables;
 
diff --git a/src/main/java/org/zwobble/mammoth/util/MammothLists.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java
index bbdaa7b..eff5411 100644
--- a/src/main/java/org/zwobble/mammoth/util/MammothLists.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothLists.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.util;
+package org.zwobble.mammoth.internal.util;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
diff --git a/src/main/java/org/zwobble/mammoth/util/MammothMaps.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java
index 782bd91..912a454 100644
--- a/src/main/java/org/zwobble/mammoth/util/MammothMaps.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothMaps.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.util;
+package org.zwobble.mammoth.internal.util;
 
 import com.google.common.collect.ImmutableMap;
 
diff --git a/src/main/java/org/zwobble/mammoth/util/MammothOptionals.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothOptionals.java
index 6890f16..b94a168 100644
--- a/src/main/java/org/zwobble/mammoth/util/MammothOptionals.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothOptionals.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.util;
+package org.zwobble.mammoth.internal.util;
 
 import java.util.Optional;
 import java.util.function.BiFunction;
diff --git a/src/main/java/org/zwobble/mammoth/util/MammothStrings.java b/src/main/java/org/zwobble/mammoth/internal/util/MammothStrings.java
index bdd826c..320f9fb 100644
--- a/src/main/java/org/zwobble/mammoth/util/MammothStrings.java
+++ b/src/main/java/org/zwobble/mammoth/internal/util/MammothStrings.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.util;
+package org.zwobble.mammoth.internal.util;
 
 public class MammothStrings {
     public static String trimLeft(String value, char character) {
diff --git a/src/main/java/org/zwobble/mammoth/xml/NullXmlElement.java b/src/main/java/org/zwobble/mammoth/internal/xml/NullXmlElement.java
index 0bec026..ecc7971 100644
--- a/src/main/java/org/zwobble/mammoth/xml/NullXmlElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/NullXmlElement.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.internal.xml;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/zwobble/mammoth/xml/XmlElement.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
index cf1dc67..157d638 100644
--- a/src/main/java/org/zwobble/mammoth/xml/XmlElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.internal.xml;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
diff --git a/src/main/java/org/zwobble/mammoth/xml/XmlElementLike.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElementLike.java
index adba7c8..bdb3cc8 100644
--- a/src/main/java/org/zwobble/mammoth/xml/XmlElementLike.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElementLike.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.internal.xml;
 
 import java.util.Optional;
 
diff --git a/src/main/java/org/zwobble/mammoth/xml/XmlElementList.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElementList.java
index b6a68ad..3facde4 100644
--- a/src/main/java/org/zwobble/mammoth/xml/XmlElementList.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElementList.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.internal.xml;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
diff --git a/src/main/java/org/zwobble/mammoth/xml/XmlNode.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlNode.java
index be8e48b..6f6e7fa 100644
--- a/src/main/java/org/zwobble/mammoth/xml/XmlNode.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlNode.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.internal.xml;
 
 public interface XmlNode {
     String innerText();
diff --git a/src/main/java/org/zwobble/mammoth/xml/XmlNodeVisitor.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlNodeVisitor.java
index 27dc382..5bbef54 100644
--- a/src/main/java/org/zwobble/mammoth/xml/XmlNodeVisitor.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlNodeVisitor.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.internal.xml;
 
 public interface XmlNodeVisitor<T> {
     T visit(XmlElement element);
diff --git a/src/main/java/org/zwobble/mammoth/xml/XmlNodes.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlNodes.java
index cf548ab..3b4bab7 100644
--- a/src/main/java/org/zwobble/mammoth/xml/XmlNodes.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlNodes.java
@@ -1,10 +1,10 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.internal.xml;
 
 import java.util.List;
 import java.util.Map;
 
-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 XmlNodes {
     public static XmlElement element(String name) {
diff --git a/src/main/java/org/zwobble/mammoth/xml/XmlTextNode.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlTextNode.java
index 453863d..02380ee 100644
--- a/src/main/java/org/zwobble/mammoth/xml/XmlTextNode.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlTextNode.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml;
+package org.zwobble.mammoth.internal.xml;
 
 public class XmlTextNode implements XmlNode {
     private final String value;
diff --git a/src/main/java/org/zwobble/mammoth/xml/parsing/ElementName.java b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/ElementName.java
index a0f5f8e..a97a683 100644
--- a/src/main/java/org/zwobble/mammoth/xml/parsing/ElementName.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/ElementName.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml.parsing;
+package org.zwobble.mammoth.internal.xml.parsing;
 
 class ElementName {
     private final String uri;
diff --git a/src/main/java/org/zwobble/mammoth/xml/parsing/SimpleSax.java b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/SimpleSax.java
index 5b7957d..047e02d 100644
--- a/src/main/java/org/zwobble/mammoth/xml/parsing/SimpleSax.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/SimpleSax.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml.parsing;
+package org.zwobble.mammoth.internal.xml.parsing;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/zwobble/mammoth/xml/parsing/SimpleSaxHandler.java b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/SimpleSaxHandler.java
index ed0af31..8358346 100644
--- a/src/main/java/org/zwobble/mammoth/xml/parsing/SimpleSaxHandler.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/SimpleSaxHandler.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml.parsing;
+package org.zwobble.mammoth.internal.xml.parsing;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/zwobble/mammoth/xml/parsing/XmlElementBuilder.java b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlElementBuilder.java
index 1115cfb..231299e 100644
--- a/src/main/java/org/zwobble/mammoth/xml/parsing/XmlElementBuilder.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlElementBuilder.java
@@ -1,7 +1,7 @@
-package org.zwobble.mammoth.xml.parsing;
+package org.zwobble.mammoth.internal.xml.parsing;
 
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlNode;
+import org.zwobble.mammoth.internal.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/zwobble/mammoth/xml/parsing/XmlParser.java b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlParser.java
index 5354f07..566dbd6 100644
--- a/src/main/java/org/zwobble/mammoth/xml/parsing/XmlParser.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlParser.java
@@ -1,4 +1,4 @@
-package org.zwobble.mammoth.xml.parsing;
+package org.zwobble.mammoth.internal.xml.parsing;
 
 import java.io.InputStream;
 import java.util.ArrayDeque;
@@ -7,8 +7,8 @@ import java.util.Map;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.BiMap;
-import org.zwobble.mammoth.xml.XmlElement;
-import org.zwobble.mammoth.xml.XmlTextNode;
+import org.zwobble.mammoth.internal.xml.XmlElement;
+import org.zwobble.mammoth.internal.xml.XmlTextNode;
 
 import static java.util.stream.Collectors.toMap;
 
diff --git a/src/main/java/org/zwobble/mammoth/results/Result.java b/src/main/java/org/zwobble/mammoth/results/Result.java
index ee3e3dc..063aba4 100644
--- a/src/main/java/org/zwobble/mammoth/results/Result.java
+++ b/src/main/java/org/zwobble/mammoth/results/Result.java
@@ -1,15 +1,15 @@
 package org.zwobble.mammoth.results;
 
 import com.google.common.collect.ImmutableList;
-import org.zwobble.mammoth.documents.Style;
-import org.zwobble.mammoth.util.MammothLists;
+import org.zwobble.mammoth.internal.documents.Style;
+import org.zwobble.mammoth.internal.util.MammothLists;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import static org.zwobble.mammoth.util.MammothLists.list;
+import static org.zwobble.mammoth.internal.util.MammothLists.list;
 
 public class Result<T> {
     public static <T> Result<List<T>> concat(Iterable<Result<T>> results) {
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());