diff --git a/SWXMLHash.xcodeproj/project.pbxproj b/SWXMLHash.xcodeproj/project.pbxproj
index f4150d1..eae120e 100644
--- a/SWXMLHash.xcodeproj/project.pbxproj
+++ b/SWXMLHash.xcodeproj/project.pbxproj
@@ -272,6 +272,39 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		63ED3C4D2821B1DB006A8A08 /* DeserializationTypes */ = {
+			isa = PBXGroup;
+			children = (
+				63ED3C062821A723006A8A08 /* Bool+XMLDeserialization.swift */,
+				63ED3C032821A723006A8A08 /* Double+XMLDeserialization.swift */,
+				6317F1A5282179E200F6C364 /* Float+XMLDeserialization.swift */,
+				63ED3C072821A723006A8A08 /* Int+XMLDeserialization.swift */,
+				63ED3C002821A723006A8A08 /* String+XMLDeserialization.swift */,
+			);
+			path = DeserializationTypes;
+			sourceTree = "<group>";
+		};
+		63ED3C4E2821B206006A8A08 /* Errors */ = {
+			isa = PBXGroup;
+			children = (
+				63ED3C2D2821B100006A8A08 /* IndexingError.swift */,
+				6317F1A02821756400F6C364 /* XMLDeserializationError.swift */,
+			);
+			name = Errors;
+			sourceTree = "<group>";
+		};
+		63ED3C4F2821C9D4006A8A08 /* Deserialization */ = {
+			isa = PBXGroup;
+			children = (
+				63ED3C022821A723006A8A08 /* XMLAttributeDeserializable.swift */,
+				63ED3C012821A723006A8A08 /* XMLDeserialization.swift */,
+				63ED3C042821A723006A8A08 /* XMLElementDeserializable.swift */,
+				54B83CC41C849D9B00D588B5 /* XMLIndexer+XMLIndexerDeserializable.swift */,
+				63ED3C052821A723006A8A08 /* XMLIndexerDeserializable.swift */,
+			);
+			path = Deserialization;
+			sourceTree = "<group>";
+		};
 		CD291F1E1BF635BE009A1FA6 /* tvOS */ = {
 			isa = PBXGroup;
 			children = (
@@ -305,23 +338,14 @@
 		CD6083F1196CA106000B4F8D /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				63ED3C062821A723006A8A08 /* Bool+XMLDeserialization.swift */,
-				63ED3C032821A723006A8A08 /* Double+XMLDeserialization.swift */,
-				6317F1A5282179E200F6C364 /* Float+XMLDeserialization.swift */,
-				63ED3C2D2821B100006A8A08 /* IndexingError.swift */,
-				63ED3C072821A723006A8A08 /* Int+XMLDeserialization.swift */,
+				63ED3C4F2821C9D4006A8A08 /* Deserialization */,
+				63ED3C4D2821B1DB006A8A08 /* DeserializationTypes */,
+				63ED3C4E2821B206006A8A08 /* Errors */,
 				6C42BED4205183AF00137D31 /* shim.swift */,
-				63ED3C002821A723006A8A08 /* String+XMLDeserialization.swift */,
 				CD6083F2196CA106000B4F8D /* Supporting Files */,
 				CD6083F4196CA106000B4F8D /* SWXMLHash.h */,
-				63ED3C022821A723006A8A08 /* XMLAttributeDeserializable.swift */,
-				63ED3C012821A723006A8A08 /* XMLDeserialization.swift */,
-				6317F1A02821756400F6C364 /* XMLDeserializationError.swift */,
-				63ED3C042821A723006A8A08 /* XMLElementDeserializable.swift */,
 				CD60840B196CA11D000B4F8D /* XMLHash.swift */,
 				63ED3C282821AF4D006A8A08 /* XMLHashOptions.swift */,
-				54B83CC41C849D9B00D588B5 /* XMLIndexer+XMLIndexerDeserializable.swift */,
-				63ED3C052821A723006A8A08 /* XMLIndexerDeserializable.swift */,
 			);
 			path = Source;
 			sourceTree = "<group>";
diff --git a/Source/XMLAttributeDeserializable.swift b/Source/Deserialization/XMLAttributeDeserializable.swift
similarity index 100%
rename from Source/XMLAttributeDeserializable.swift
rename to Source/Deserialization/XMLAttributeDeserializable.swift
diff --git a/Source/XMLDeserialization.swift b/Source/Deserialization/XMLDeserialization.swift
similarity index 100%
rename from Source/XMLDeserialization.swift
rename to Source/Deserialization/XMLDeserialization.swift
diff --git a/Source/XMLElementDeserializable.swift b/Source/Deserialization/XMLElementDeserializable.swift
similarity index 100%
rename from Source/XMLElementDeserializable.swift
rename to Source/Deserialization/XMLElementDeserializable.swift
diff --git a/Source/XMLIndexer+XMLIndexerDeserializable.swift b/Source/Deserialization/XMLIndexer+XMLIndexerDeserializable.swift
similarity index 100%
rename from Source/XMLIndexer+XMLIndexerDeserializable.swift
rename to Source/Deserialization/XMLIndexer+XMLIndexerDeserializable.swift
diff --git a/Source/XMLIndexerDeserializable.swift b/Source/Deserialization/XMLIndexerDeserializable.swift
similarity index 100%
rename from Source/XMLIndexerDeserializable.swift
rename to Source/Deserialization/XMLIndexerDeserializable.swift
diff --git a/Source/Bool+XMLDeserialization.swift b/Source/DeserializationTypes/Bool+XMLDeserialization.swift
similarity index 100%
rename from Source/Bool+XMLDeserialization.swift
rename to Source/DeserializationTypes/Bool+XMLDeserialization.swift
diff --git a/Source/Double+XMLDeserialization.swift b/Source/DeserializationTypes/Double+XMLDeserialization.swift
similarity index 100%
rename from Source/Double+XMLDeserialization.swift
rename to Source/DeserializationTypes/Double+XMLDeserialization.swift
diff --git a/Source/Float+XMLDeserialization.swift b/Source/DeserializationTypes/Float+XMLDeserialization.swift
similarity index 100%
rename from Source/Float+XMLDeserialization.swift
rename to Source/DeserializationTypes/Float+XMLDeserialization.swift
diff --git a/Source/Int+XMLDeserialization.swift b/Source/DeserializationTypes/Int+XMLDeserialization.swift
similarity index 100%
rename from Source/Int+XMLDeserialization.swift
rename to Source/DeserializationTypes/Int+XMLDeserialization.swift
diff --git a/Source/String+XMLDeserialization.swift b/Source/DeserializationTypes/String+XMLDeserialization.swift
similarity index 100%
rename from Source/String+XMLDeserialization.swift
rename to Source/DeserializationTypes/String+XMLDeserialization.swift
diff --git a/Source/IndexingError.swift b/Source/IndexingError.swift
index e1bde8c..044a507 100644
--- a/Source/IndexingError.swift
+++ b/Source/IndexingError.swift
@@ -112,4 +112,3 @@ extension IndexingError: LocalizedError {
         }
     }
 }
-
diff --git a/Source/XMLHashOptions.swift b/Source/XMLHashOptions.swift
index 8b49dd3..5679474 100644
--- a/Source/XMLHashOptions.swift
+++ b/Source/XMLHashOptions.swift
@@ -50,4 +50,3 @@ public class XMLHashOptions {
     /// attempt to handle HTML which isn't always XML-compatible
     public var detectParsingErrors = false
 }
-