diff --git a/old_pytiled_parser/__init__.py b/old_pytiled_parser/__init__.py
new file mode 100644
index 0000000..d58a1b1
--- /dev/null
+++ b/old_pytiled_parser/__init__.py
@@ -0,0 +1,4 @@
+"""init for pytiled_parser"""
+
+from . import objects, utilities
+from .xml_parser import parse_tile_map
diff --git a/pytiled_parser/objects.py b/old_pytiled_parser/objects.py
similarity index 100%
rename from pytiled_parser/objects.py
rename to old_pytiled_parser/objects.py
diff --git a/pytiled_parser/typing_helpers.py b/old_pytiled_parser/typing_helpers.py
similarity index 100%
rename from pytiled_parser/typing_helpers.py
rename to old_pytiled_parser/typing_helpers.py
diff --git a/pytiled_parser/utilities.py b/old_pytiled_parser/utilities.py
similarity index 100%
rename from pytiled_parser/utilities.py
rename to old_pytiled_parser/utilities.py
diff --git a/pytiled_parser/xml_parser.py b/old_pytiled_parser/xml_parser.py
similarity index 100%
rename from pytiled_parser/xml_parser.py
rename to old_pytiled_parser/xml_parser.py
diff --git a/tests/__init__.py b/old_tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to old_tests/__init__.py
diff --git a/old_tests/test_data/images/tmw_desert_spacing.png b/old_tests/test_data/images/tmw_desert_spacing.png
new file mode 100644
index 0000000..4e9995c
Binary files /dev/null and b/old_tests/test_data/images/tmw_desert_spacing.png differ
diff --git a/tests/test_data/test_map_image_tile_set.tmx b/old_tests/test_data/test_map_image_tile_set.tmx
similarity index 100%
rename from tests/test_data/test_map_image_tile_set.tmx
rename to old_tests/test_data/test_map_image_tile_set.tmx
diff --git a/tests/test_data/test_map_infinite.tmx b/old_tests/test_data/test_map_infinite.tmx
similarity index 100%
rename from tests/test_data/test_map_infinite.tmx
rename to old_tests/test_data/test_map_infinite.tmx
diff --git a/tests/test_data/test_map_simple.tmx b/old_tests/test_data/test_map_simple.tmx
similarity index 100%
rename from tests/test_data/test_map_simple.tmx
rename to old_tests/test_data/test_map_simple.tmx
diff --git a/tests/test_data/test_map_simple_meme.tmx b/old_tests/test_data/test_map_simple_meme.tmx
similarity index 100%
rename from tests/test_data/test_map_simple_meme.tmx
rename to old_tests/test_data/test_map_simple_meme.tmx
diff --git a/tests/test_data/test_map_simple_objects.tmx b/old_tests/test_data/test_map_simple_objects.tmx
similarity index 100%
rename from tests/test_data/test_map_simple_objects.tmx
rename to old_tests/test_data/test_map_simple_objects.tmx
diff --git a/tests/test_data/test_map_simple_offset.tmx b/old_tests/test_data/test_map_simple_offset.tmx
similarity index 100%
rename from tests/test_data/test_map_simple_offset.tmx
rename to old_tests/test_data/test_map_simple_offset.tmx
diff --git a/tests/test_data/tile_set_image.tsx b/old_tests/test_data/tile_set_image.tsx
similarity index 100%
rename from tests/test_data/tile_set_image.tsx
rename to old_tests/test_data/tile_set_image.tsx
diff --git a/tests/test_data/tile_set_image_objects.tsx b/old_tests/test_data/tile_set_image_objects.tsx
similarity index 100%
rename from tests/test_data/tile_set_image_objects.tsx
rename to old_tests/test_data/tile_set_image_objects.tsx
diff --git a/tests/test_infinite_maps.py b/old_tests/test_infinite_maps.py
similarity index 100%
rename from tests/test_infinite_maps.py
rename to old_tests/test_infinite_maps.py
diff --git a/tests/test_parser.py b/old_tests/test_parser.py
similarity index 100%
rename from tests/test_parser.py
rename to old_tests/test_parser.py
diff --git a/tests/test_pytiled_parser_integration.py b/old_tests/test_pytiled_parser_integration.py
similarity index 100%
rename from tests/test_pytiled_parser_integration.py
rename to old_tests/test_pytiled_parser_integration.py
diff --git a/tests/test_test_map_simple_offset.py b/old_tests/test_test_map_simple_offset.py
similarity index 100%
rename from tests/test_test_map_simple_offset.py
rename to old_tests/test_test_map_simple_offset.py
diff --git a/tests/test_typing_helpers.py b/old_tests/test_typing_helpers.py
similarity index 100%
rename from tests/test_typing_helpers.py
rename to old_tests/test_typing_helpers.py
diff --git a/pytiled_parser/__init__.py b/pytiled_parser/__init__.py
index d58a1b1..7fd3538 100644
--- a/pytiled_parser/__init__.py
+++ b/pytiled_parser/__init__.py
@@ -1,4 +1 @@
-"""init for pytiled_parser"""
-
-from . import objects, utilities
-from .xml_parser import parse_tile_map
+"""Parse Tiled Maps and Tilesets"""
diff --git a/tests/test_data/simple_external_tileset/map.json b/tests/test_data/simple_external_tileset/map.json
new file mode 100644
index 0000000..1b89be4
--- /dev/null
+++ b/tests/test_data/simple_external_tileset/map.json
@@ -0,0 +1,68 @@
+{ "compressionlevel":0,
+ "height":6,
+ "infinite":false,
+ "layers":[
+        {
+         "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48],
+         "height":6,
+         "id":1,
+         "name":"Tile Layer 1",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":8,
+         "x":0,
+         "y":0
+        }],
+ "nextlayerid":2,
+ "nextobjectid":1,
+ "orientation":"orthogonal",
+ "properties":[
+        {
+         "name":"bool property - false",
+         "type":"bool",
+         "value":false
+        }, 
+        {
+         "name":"bool property - true",
+         "type":"bool",
+         "value":true
+        }, 
+        {
+         "name":"color property",
+         "type":"color",
+         "value":"#ff49fcff"
+        }, 
+        {
+         "name":"file property",
+         "type":"file",
+         "value":"..\/..\/..\/..\/..\/..\/..\/var\/log\/syslog"
+        }, 
+        {
+         "name":"float property",
+         "type":"float",
+         "value":1.23456789
+        }, 
+        {
+         "name":"int property",
+         "type":"int",
+         "value":13
+        }, 
+        {
+         "name":"string property",
+         "type":"string",
+         "value":"Hello, World!!"
+        }],
+ "renderorder":"right-down",
+ "tiledversion":"1.3.1",
+ "tileheight":32,
+ "tilesets":[
+        {
+         "firstgid":1,
+         "source":"tile_set.json"
+        }],
+ "tilewidth":32,
+ "type":"map",
+ "version":1.2,
+ "width":8
+}
\ No newline at end of file
diff --git a/tests/test_data/simple_external_tileset/tile_set.json b/tests/test_data/simple_external_tileset/tile_set.json
new file mode 100644
index 0000000..c1431bb
--- /dev/null
+++ b/tests/test_data/simple_external_tileset/tile_set.json
@@ -0,0 +1,14 @@
+{ "columns":8,
+ "image":"..\/images\/tmw_desert_spacing.png",
+ "imageheight":199,
+ "imagewidth":265,
+ "margin":1,
+ "name":"tile_set_image",
+ "spacing":1,
+ "tilecount":48,
+ "tiledversion":"1.3.1",
+ "tileheight":32,
+ "tilewidth":32,
+ "type":"tileset",
+ "version":1.2
+}
\ No newline at end of file