diff --git a/.travis.yml b/.travis.yml
index 7a8ba35..f2f310e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,4 +25,4 @@ install:
 script:
   - vendor/bin/phpunit
   - vendor/bin/phpunit test/CommonMarkTestWeak.php || true
-  - '[ -z "$TRAVIS_TAG" ] || [ "$TRAVIS_TAG" == "$(php -r "require(\"Parsedown.php\"); echo Parsedown::version;")" ]'
+  - '[ -z "$TRAVIS_TAG" ] || [ "$TRAVIS_TAG" == "$(php -r "require(\"vendor/autoload.php\"); echo Erusev\Parsedown\Parsedown::version;")" ]'
diff --git a/composer.json b/composer.json
index f8b40f8..301a6f6 100644
--- a/composer.json
+++ b/composer.json
@@ -20,14 +20,9 @@
         "phpunit/phpunit": "^4.8.35"
     },
     "autoload": {
-        "psr-0": {"Parsedown": ""}
+        "psr-4": {"Erusev\\Parsedown\\": "src/"}
     },
     "autoload-dev": {
-        "psr-0": {
-            "TestParsedown": "test/",
-            "ParsedownTest": "test/",
-            "CommonMarkTest": "test/",
-            "CommonMarkTestWeak": "test/"
-        }
+        "psr-4": {"Erusev\\Parsedown\\Tests\\": "tests/"}
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4fe3177..6b39037 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 <phpunit bootstrap="vendor/autoload.php" colors="true">
 	<testsuites>
 		<testsuite>
-			<file>test/ParsedownTest.php</file>
+			<file>tests/ParsedownTest.php</file>
 		</testsuite>
 	</testsuites>
 </phpunit>
diff --git a/Parsedown.php b/src/Parsedown.php
similarity index 99%
rename from Parsedown.php
rename to src/Parsedown.php
index ae0cbde..1be2e13 100644
--- a/Parsedown.php
+++ b/src/Parsedown.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Erusev\Parsedown;
 
 #
 #
@@ -17,7 +20,7 @@ class Parsedown
 {
     # ~
 
-    const version = '1.8.0-beta-7';
+    const version = '2.0.0-dev';
 
     # ~
 
diff --git a/test/CommonMarkTestStrict.php b/tests/CommonMarkTestStrict.php
similarity index 97%
rename from test/CommonMarkTestStrict.php
rename to tests/CommonMarkTestStrict.php
index 3837738..7184966 100644
--- a/test/CommonMarkTestStrict.php
+++ b/tests/CommonMarkTestStrict.php
@@ -1,4 +1,7 @@
 <?php
+declare(strict_types=1);
+
+namespace Erusev\Parsedown\Tests;
 
 /**
  * Test Parsedown against the CommonMark spec
diff --git a/test/CommonMarkTestWeak.php b/tests/CommonMarkTestWeak.php
similarity index 97%
rename from test/CommonMarkTestWeak.php
rename to tests/CommonMarkTestWeak.php
index ef4081a..e921754 100644
--- a/test/CommonMarkTestWeak.php
+++ b/tests/CommonMarkTestWeak.php
@@ -1,5 +1,7 @@
 <?php
-require_once(__DIR__ . '/CommonMarkTestStrict.php');
+declare(strict_types=1);
+
+namespace Erusev\Parsedown\Tests;
 
 /**
  * Test Parsedown against the CommonMark spec, but less aggressive
diff --git a/test/ParsedownTest.php b/tests/ParsedownTest.php
similarity index 90%
rename from test/ParsedownTest.php
rename to tests/ParsedownTest.php
index bf40317..e51d937 100755
--- a/test/ParsedownTest.php
+++ b/tests/ParsedownTest.php
@@ -1,7 +1,10 @@
 <?php
-require 'SampleExtensions.php';
+declare(strict_types=1);
+
+namespace Erusev\Parsedown\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Erusev\Parsedown\Parsedown;
 
 class ParsedownTest extends TestCase
 {
@@ -64,7 +67,7 @@ class ParsedownTest extends TestCase
         $expectedMarkup = '<pre><code class="language-php"><p>foobar</p></code></pre>';
         $expectedSafeMarkup = '<pre><code class="language-php">&lt;p&gt;foobar&lt;/p&gt;</code></pre>';
 
-        $unsafeExtension = new UnsafeExtension;
+        $unsafeExtension = new SampleExtensions\UnsafeExtension;
         $actualMarkup = $unsafeExtension->text($markdown);
 
         $this->assertEquals($expectedMarkup, $actualMarkup);
@@ -81,7 +84,7 @@ class ParsedownTest extends TestCase
         $expectedMarkup = '<pre><code class="language-php"><p>foobar</p></code></pre>';
         $expectedSafeMarkup = $expectedMarkup;
 
-        $unsafeExtension = new TrustDelegatedExtension;
+        $unsafeExtension = new SampleExtensions\TrustDelegatedExtension;
         $actualMarkup = $unsafeExtension->text($markdown);
 
         $this->assertEquals($expectedMarkup, $actualMarkup);
@@ -98,7 +101,7 @@ class ParsedownTest extends TestCase
 
         foreach ($this->dirs as $dir)
         {
-            $Folder = new DirectoryIterator($dir);
+            $Folder = new \DirectoryIterator($dir);
 
             foreach ($Folder as $File)
             {
@@ -182,16 +185,16 @@ EXPECTED_HTML;
     public function testLateStaticBinding()
     {
         $parsedown = Parsedown::instance();
-        $this->assertInstanceOf('Parsedown', $parsedown);
+        $this->assertInstanceOf(Parsedown::class, $parsedown);
 
         // After instance is already called on Parsedown
         // subsequent calls with the same arguments return the same instance
         $sameParsedown = TestParsedown::instance();
-        $this->assertInstanceOf('Parsedown', $sameParsedown);
+        $this->assertInstanceOf(Parsedown::class, $sameParsedown);
         $this->assertSame($parsedown, $sameParsedown);
 
         $testParsedown = TestParsedown::instance('test late static binding');
-        $this->assertInstanceOf('TestParsedown', $testParsedown);
+        $this->assertInstanceOf(TestParsedown::class, $testParsedown);
 
         $sameInstanceAgain = TestParsedown::instance('test late static binding');
         $this->assertSame($testParsedown, $sameInstanceAgain);
diff --git a/test/SampleExtensions.php b/tests/SampleExtensions/TrustDelegatedExtension.php
similarity index 50%
rename from test/SampleExtensions.php
rename to tests/SampleExtensions/TrustDelegatedExtension.php
index e855c71..04cfee8 100644
--- a/test/SampleExtensions.php
+++ b/tests/SampleExtensions/TrustDelegatedExtension.php
@@ -1,25 +1,12 @@
 <?php
 
-class UnsafeExtension extends Parsedown
-{
-    protected function blockFencedCodeComplete($Block)
-    {
-        $text = $Block['element']['element']['text'];
-        unset($Block['element']['element']['text']);
+declare(strict_types=1);
 
-        // WARNING: There is almost always a better way of doing things!
-        //
-        // This example is one of them, unsafe behaviour is NOT needed here.
-        // Only use this if you trust the input and have no idea what
-        // the output HTML will look like (e.g. using an external parser).
-        $Block['element']['element']['rawHtml'] = "<p>$text</p>";
+namespace Erusev\Parsedown\Tests\SampleExtensions;
 
-        return $Block;
-    }
-}
+use Erusev\Parsedown\Tests\TestParsedown;
 
-
-class TrustDelegatedExtension extends Parsedown
+class TrustDelegatedExtension extends TestParsedown
 {
     protected function blockFencedCodeComplete($Block)
     {
diff --git a/tests/SampleExtensions/UnsafeExtension.php b/tests/SampleExtensions/UnsafeExtension.php
new file mode 100644
index 0000000..91c03d1
--- /dev/null
+++ b/tests/SampleExtensions/UnsafeExtension.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Erusev\Parsedown\Tests\SampleExtensions;
+
+use Erusev\Parsedown\Tests\TestParsedown;
+
+class UnsafeExtension extends TestParsedown
+{
+    protected function blockFencedCodeComplete($Block)
+    {
+        $text = $Block['element']['element']['text'];
+        unset($Block['element']['element']['text']);
+
+        // WARNING: There is almost always a better way of doing things!
+        //
+        // This example is one of them, unsafe behaviour is NOT needed here.
+        // Only use this if you trust the input and have no idea what
+        // the output HTML will look like (e.g. using an external parser).
+        $Block['element']['element']['rawHtml'] = "<p>$text</p>";
+
+        return $Block;
+    }
+}
diff --git a/test/TestParsedown.php b/tests/TestParsedown.php
similarity index 60%
rename from test/TestParsedown.php
rename to tests/TestParsedown.php
index 2faa0ab..a6267ed 100644
--- a/test/TestParsedown.php
+++ b/tests/TestParsedown.php
@@ -1,5 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
+namespace Erusev\Parsedown\Tests;
+
+use Erusev\Parsedown\Parsedown;
+
 class TestParsedown extends Parsedown
 {
     public function getTextLevelElements()
diff --git a/test/data/aesthetic_table.html b/tests/data/aesthetic_table.html
similarity index 100%
rename from test/data/aesthetic_table.html
rename to tests/data/aesthetic_table.html
diff --git a/test/data/aesthetic_table.md b/tests/data/aesthetic_table.md
similarity index 100%
rename from test/data/aesthetic_table.md
rename to tests/data/aesthetic_table.md
diff --git a/test/data/aligned_table.html b/tests/data/aligned_table.html
similarity index 100%
rename from test/data/aligned_table.html
rename to tests/data/aligned_table.html
diff --git a/test/data/aligned_table.md b/tests/data/aligned_table.md
similarity index 100%
rename from test/data/aligned_table.md
rename to tests/data/aligned_table.md
diff --git a/test/data/atx_heading.html b/tests/data/atx_heading.html
similarity index 100%
rename from test/data/atx_heading.html
rename to tests/data/atx_heading.html
diff --git a/test/data/atx_heading.md b/tests/data/atx_heading.md
similarity index 100%
rename from test/data/atx_heading.md
rename to tests/data/atx_heading.md
diff --git a/test/data/automatic_link.html b/tests/data/automatic_link.html
similarity index 100%
rename from test/data/automatic_link.html
rename to tests/data/automatic_link.html
diff --git a/test/data/automatic_link.md b/tests/data/automatic_link.md
similarity index 100%
rename from test/data/automatic_link.md
rename to tests/data/automatic_link.md
diff --git a/test/data/block-level_html.html b/tests/data/block-level_html.html
similarity index 100%
rename from test/data/block-level_html.html
rename to tests/data/block-level_html.html
diff --git a/test/data/block-level_html.md b/tests/data/block-level_html.md
similarity index 100%
rename from test/data/block-level_html.md
rename to tests/data/block-level_html.md
diff --git a/test/data/code_block.html b/tests/data/code_block.html
similarity index 100%
rename from test/data/code_block.html
rename to tests/data/code_block.html
diff --git a/test/data/code_block.md b/tests/data/code_block.md
similarity index 100%
rename from test/data/code_block.md
rename to tests/data/code_block.md
diff --git a/test/data/code_span.html b/tests/data/code_span.html
similarity index 100%
rename from test/data/code_span.html
rename to tests/data/code_span.html
diff --git a/test/data/code_span.md b/tests/data/code_span.md
similarity index 100%
rename from test/data/code_span.md
rename to tests/data/code_span.md
diff --git a/test/data/compound_blockquote.html b/tests/data/compound_blockquote.html
similarity index 100%
rename from test/data/compound_blockquote.html
rename to tests/data/compound_blockquote.html
diff --git a/test/data/compound_blockquote.md b/tests/data/compound_blockquote.md
similarity index 100%
rename from test/data/compound_blockquote.md
rename to tests/data/compound_blockquote.md
diff --git a/test/data/compound_emphasis.html b/tests/data/compound_emphasis.html
similarity index 100%
rename from test/data/compound_emphasis.html
rename to tests/data/compound_emphasis.html
diff --git a/test/data/compound_emphasis.md b/tests/data/compound_emphasis.md
similarity index 100%
rename from test/data/compound_emphasis.md
rename to tests/data/compound_emphasis.md
diff --git a/test/data/compound_list.html b/tests/data/compound_list.html
similarity index 100%
rename from test/data/compound_list.html
rename to tests/data/compound_list.html
diff --git a/test/data/compound_list.md b/tests/data/compound_list.md
similarity index 100%
rename from test/data/compound_list.md
rename to tests/data/compound_list.md
diff --git a/test/data/deeply_nested_list.html b/tests/data/deeply_nested_list.html
similarity index 100%
rename from test/data/deeply_nested_list.html
rename to tests/data/deeply_nested_list.html
diff --git a/test/data/deeply_nested_list.md b/tests/data/deeply_nested_list.md
similarity index 100%
rename from test/data/deeply_nested_list.md
rename to tests/data/deeply_nested_list.md
diff --git a/test/data/em_strong.html b/tests/data/em_strong.html
similarity index 100%
rename from test/data/em_strong.html
rename to tests/data/em_strong.html
diff --git a/test/data/em_strong.md b/tests/data/em_strong.md
similarity index 100%
rename from test/data/em_strong.md
rename to tests/data/em_strong.md
diff --git a/test/data/email.html b/tests/data/email.html
similarity index 100%
rename from test/data/email.html
rename to tests/data/email.html
diff --git a/test/data/email.md b/tests/data/email.md
similarity index 100%
rename from test/data/email.md
rename to tests/data/email.md
diff --git a/test/data/emphasis.html b/tests/data/emphasis.html
similarity index 100%
rename from test/data/emphasis.html
rename to tests/data/emphasis.html
diff --git a/test/data/emphasis.md b/tests/data/emphasis.md
similarity index 100%
rename from test/data/emphasis.md
rename to tests/data/emphasis.md
diff --git a/test/data/escaping.html b/tests/data/escaping.html
similarity index 100%
rename from test/data/escaping.html
rename to tests/data/escaping.html
diff --git a/test/data/escaping.md b/tests/data/escaping.md
similarity index 100%
rename from test/data/escaping.md
rename to tests/data/escaping.md
diff --git a/test/data/fenced_code_block.html b/tests/data/fenced_code_block.html
similarity index 100%
rename from test/data/fenced_code_block.html
rename to tests/data/fenced_code_block.html
diff --git a/test/data/fenced_code_block.md b/tests/data/fenced_code_block.md
similarity index 100%
rename from test/data/fenced_code_block.md
rename to tests/data/fenced_code_block.md
diff --git a/test/data/horizontal_rule.html b/tests/data/horizontal_rule.html
similarity index 100%
rename from test/data/horizontal_rule.html
rename to tests/data/horizontal_rule.html
diff --git a/test/data/horizontal_rule.md b/tests/data/horizontal_rule.md
similarity index 100%
rename from test/data/horizontal_rule.md
rename to tests/data/horizontal_rule.md
diff --git a/test/data/html_comment.html b/tests/data/html_comment.html
similarity index 100%
rename from test/data/html_comment.html
rename to tests/data/html_comment.html
diff --git a/test/data/html_comment.md b/tests/data/html_comment.md
similarity index 100%
rename from test/data/html_comment.md
rename to tests/data/html_comment.md
diff --git a/test/data/html_entity.html b/tests/data/html_entity.html
similarity index 100%
rename from test/data/html_entity.html
rename to tests/data/html_entity.html
diff --git a/test/data/html_entity.md b/tests/data/html_entity.md
similarity index 100%
rename from test/data/html_entity.md
rename to tests/data/html_entity.md
diff --git a/test/data/image_reference.html b/tests/data/image_reference.html
similarity index 100%
rename from test/data/image_reference.html
rename to tests/data/image_reference.html
diff --git a/test/data/image_reference.md b/tests/data/image_reference.md
similarity index 100%
rename from test/data/image_reference.md
rename to tests/data/image_reference.md
diff --git a/test/data/image_title.html b/tests/data/image_title.html
similarity index 100%
rename from test/data/image_title.html
rename to tests/data/image_title.html
diff --git a/test/data/image_title.md b/tests/data/image_title.md
similarity index 100%
rename from test/data/image_title.md
rename to tests/data/image_title.md
diff --git a/test/data/implicit_reference.html b/tests/data/implicit_reference.html
similarity index 100%
rename from test/data/implicit_reference.html
rename to tests/data/implicit_reference.html
diff --git a/test/data/implicit_reference.md b/tests/data/implicit_reference.md
similarity index 100%
rename from test/data/implicit_reference.md
rename to tests/data/implicit_reference.md
diff --git a/test/data/inline_link.html b/tests/data/inline_link.html
similarity index 100%
rename from test/data/inline_link.html
rename to tests/data/inline_link.html
diff --git a/test/data/inline_link.md b/tests/data/inline_link.md
similarity index 100%
rename from test/data/inline_link.md
rename to tests/data/inline_link.md
diff --git a/test/data/inline_link_title.html b/tests/data/inline_link_title.html
similarity index 100%
rename from test/data/inline_link_title.html
rename to tests/data/inline_link_title.html
diff --git a/test/data/inline_link_title.md b/tests/data/inline_link_title.md
similarity index 100%
rename from test/data/inline_link_title.md
rename to tests/data/inline_link_title.md
diff --git a/test/data/inline_title.html b/tests/data/inline_title.html
similarity index 100%
rename from test/data/inline_title.html
rename to tests/data/inline_title.html
diff --git a/test/data/inline_title.md b/tests/data/inline_title.md
similarity index 100%
rename from test/data/inline_title.md
rename to tests/data/inline_title.md
diff --git a/test/data/lazy_blockquote.html b/tests/data/lazy_blockquote.html
similarity index 100%
rename from test/data/lazy_blockquote.html
rename to tests/data/lazy_blockquote.html
diff --git a/test/data/lazy_blockquote.md b/tests/data/lazy_blockquote.md
similarity index 100%
rename from test/data/lazy_blockquote.md
rename to tests/data/lazy_blockquote.md
diff --git a/test/data/lazy_list.html b/tests/data/lazy_list.html
similarity index 100%
rename from test/data/lazy_list.html
rename to tests/data/lazy_list.html
diff --git a/test/data/lazy_list.md b/tests/data/lazy_list.md
similarity index 100%
rename from test/data/lazy_list.md
rename to tests/data/lazy_list.md
diff --git a/test/data/line_break.html b/tests/data/line_break.html
similarity index 100%
rename from test/data/line_break.html
rename to tests/data/line_break.html
diff --git a/test/data/line_break.md b/tests/data/line_break.md
similarity index 100%
rename from test/data/line_break.md
rename to tests/data/line_break.md
diff --git a/test/data/markup_consecutive_one.html b/tests/data/markup_consecutive_one.html
similarity index 100%
rename from test/data/markup_consecutive_one.html
rename to tests/data/markup_consecutive_one.html
diff --git a/test/data/markup_consecutive_one.md b/tests/data/markup_consecutive_one.md
similarity index 100%
rename from test/data/markup_consecutive_one.md
rename to tests/data/markup_consecutive_one.md
diff --git a/test/data/markup_consecutive_one_line.html b/tests/data/markup_consecutive_one_line.html
similarity index 100%
rename from test/data/markup_consecutive_one_line.html
rename to tests/data/markup_consecutive_one_line.html
diff --git a/test/data/markup_consecutive_one_line.md b/tests/data/markup_consecutive_one_line.md
similarity index 100%
rename from test/data/markup_consecutive_one_line.md
rename to tests/data/markup_consecutive_one_line.md
diff --git a/test/data/markup_consecutive_one_stripped.html b/tests/data/markup_consecutive_one_stripped.html
similarity index 100%
rename from test/data/markup_consecutive_one_stripped.html
rename to tests/data/markup_consecutive_one_stripped.html
diff --git a/test/data/markup_consecutive_one_stripped.md b/tests/data/markup_consecutive_one_stripped.md
similarity index 100%
rename from test/data/markup_consecutive_one_stripped.md
rename to tests/data/markup_consecutive_one_stripped.md
diff --git a/test/data/markup_consecutive_two.html b/tests/data/markup_consecutive_two.html
similarity index 100%
rename from test/data/markup_consecutive_two.html
rename to tests/data/markup_consecutive_two.html
diff --git a/test/data/markup_consecutive_two.md b/tests/data/markup_consecutive_two.md
similarity index 100%
rename from test/data/markup_consecutive_two.md
rename to tests/data/markup_consecutive_two.md
diff --git a/test/data/markup_consecutive_two_lines.html b/tests/data/markup_consecutive_two_lines.html
similarity index 100%
rename from test/data/markup_consecutive_two_lines.html
rename to tests/data/markup_consecutive_two_lines.html
diff --git a/test/data/markup_consecutive_two_lines.md b/tests/data/markup_consecutive_two_lines.md
similarity index 100%
rename from test/data/markup_consecutive_two_lines.md
rename to tests/data/markup_consecutive_two_lines.md
diff --git a/test/data/markup_consecutive_two_stripped.html b/tests/data/markup_consecutive_two_stripped.html
similarity index 100%
rename from test/data/markup_consecutive_two_stripped.html
rename to tests/data/markup_consecutive_two_stripped.html
diff --git a/test/data/markup_consecutive_two_stripped.md b/tests/data/markup_consecutive_two_stripped.md
similarity index 100%
rename from test/data/markup_consecutive_two_stripped.md
rename to tests/data/markup_consecutive_two_stripped.md
diff --git a/test/data/multiline_list_paragraph.html b/tests/data/multiline_list_paragraph.html
similarity index 100%
rename from test/data/multiline_list_paragraph.html
rename to tests/data/multiline_list_paragraph.html
diff --git a/test/data/multiline_list_paragraph.md b/tests/data/multiline_list_paragraph.md
similarity index 100%
rename from test/data/multiline_list_paragraph.md
rename to tests/data/multiline_list_paragraph.md
diff --git a/test/data/multiline_lists.html b/tests/data/multiline_lists.html
similarity index 100%
rename from test/data/multiline_lists.html
rename to tests/data/multiline_lists.html
diff --git a/test/data/multiline_lists.md b/tests/data/multiline_lists.md
similarity index 100%
rename from test/data/multiline_lists.md
rename to tests/data/multiline_lists.md
diff --git a/test/data/nested_block-level_html.html b/tests/data/nested_block-level_html.html
similarity index 100%
rename from test/data/nested_block-level_html.html
rename to tests/data/nested_block-level_html.html
diff --git a/test/data/nested_block-level_html.md b/tests/data/nested_block-level_html.md
similarity index 100%
rename from test/data/nested_block-level_html.md
rename to tests/data/nested_block-level_html.md
diff --git a/test/data/ordered_list.html b/tests/data/ordered_list.html
similarity index 100%
rename from test/data/ordered_list.html
rename to tests/data/ordered_list.html
diff --git a/test/data/ordered_list.md b/tests/data/ordered_list.md
similarity index 100%
rename from test/data/ordered_list.md
rename to tests/data/ordered_list.md
diff --git a/test/data/paragraph_list.html b/tests/data/paragraph_list.html
similarity index 100%
rename from test/data/paragraph_list.html
rename to tests/data/paragraph_list.html
diff --git a/test/data/paragraph_list.md b/tests/data/paragraph_list.md
similarity index 100%
rename from test/data/paragraph_list.md
rename to tests/data/paragraph_list.md
diff --git a/test/data/reference_title.html b/tests/data/reference_title.html
similarity index 100%
rename from test/data/reference_title.html
rename to tests/data/reference_title.html
diff --git a/test/data/reference_title.md b/tests/data/reference_title.md
similarity index 100%
rename from test/data/reference_title.md
rename to tests/data/reference_title.md
diff --git a/test/data/self-closing_html.html b/tests/data/self-closing_html.html
similarity index 100%
rename from test/data/self-closing_html.html
rename to tests/data/self-closing_html.html
diff --git a/test/data/self-closing_html.md b/tests/data/self-closing_html.md
similarity index 100%
rename from test/data/self-closing_html.md
rename to tests/data/self-closing_html.md
diff --git a/test/data/separated_nested_list.html b/tests/data/separated_nested_list.html
similarity index 100%
rename from test/data/separated_nested_list.html
rename to tests/data/separated_nested_list.html
diff --git a/test/data/separated_nested_list.md b/tests/data/separated_nested_list.md
similarity index 100%
rename from test/data/separated_nested_list.md
rename to tests/data/separated_nested_list.md
diff --git a/test/data/setext_header.html b/tests/data/setext_header.html
similarity index 100%
rename from test/data/setext_header.html
rename to tests/data/setext_header.html
diff --git a/test/data/setext_header.md b/tests/data/setext_header.md
similarity index 100%
rename from test/data/setext_header.md
rename to tests/data/setext_header.md
diff --git a/test/data/setext_header_spaces.html b/tests/data/setext_header_spaces.html
similarity index 100%
rename from test/data/setext_header_spaces.html
rename to tests/data/setext_header_spaces.html
diff --git a/test/data/setext_header_spaces.md b/tests/data/setext_header_spaces.md
similarity index 100%
rename from test/data/setext_header_spaces.md
rename to tests/data/setext_header_spaces.md
diff --git a/test/data/simple_blockquote.html b/tests/data/simple_blockquote.html
similarity index 100%
rename from test/data/simple_blockquote.html
rename to tests/data/simple_blockquote.html
diff --git a/test/data/simple_blockquote.md b/tests/data/simple_blockquote.md
similarity index 100%
rename from test/data/simple_blockquote.md
rename to tests/data/simple_blockquote.md
diff --git a/test/data/simple_table.html b/tests/data/simple_table.html
similarity index 100%
rename from test/data/simple_table.html
rename to tests/data/simple_table.html
diff --git a/test/data/simple_table.md b/tests/data/simple_table.md
similarity index 100%
rename from test/data/simple_table.md
rename to tests/data/simple_table.md
diff --git a/test/data/span-level_html.html b/tests/data/span-level_html.html
similarity index 100%
rename from test/data/span-level_html.html
rename to tests/data/span-level_html.html
diff --git a/test/data/span-level_html.md b/tests/data/span-level_html.md
similarity index 100%
rename from test/data/span-level_html.md
rename to tests/data/span-level_html.md
diff --git a/test/data/sparse_dense_list.html b/tests/data/sparse_dense_list.html
similarity index 100%
rename from test/data/sparse_dense_list.html
rename to tests/data/sparse_dense_list.html
diff --git a/test/data/sparse_dense_list.md b/tests/data/sparse_dense_list.md
similarity index 100%
rename from test/data/sparse_dense_list.md
rename to tests/data/sparse_dense_list.md
diff --git a/test/data/sparse_html.html b/tests/data/sparse_html.html
similarity index 100%
rename from test/data/sparse_html.html
rename to tests/data/sparse_html.html
diff --git a/test/data/sparse_html.md b/tests/data/sparse_html.md
similarity index 100%
rename from test/data/sparse_html.md
rename to tests/data/sparse_html.md
diff --git a/test/data/sparse_list.html b/tests/data/sparse_list.html
similarity index 100%
rename from test/data/sparse_list.html
rename to tests/data/sparse_list.html
diff --git a/test/data/sparse_list.md b/tests/data/sparse_list.md
similarity index 100%
rename from test/data/sparse_list.md
rename to tests/data/sparse_list.md
diff --git a/test/data/special_characters.html b/tests/data/special_characters.html
similarity index 100%
rename from test/data/special_characters.html
rename to tests/data/special_characters.html
diff --git a/test/data/special_characters.md b/tests/data/special_characters.md
similarity index 100%
rename from test/data/special_characters.md
rename to tests/data/special_characters.md
diff --git a/test/data/strict_atx_heading.html b/tests/data/strict_atx_heading.html
similarity index 100%
rename from test/data/strict_atx_heading.html
rename to tests/data/strict_atx_heading.html
diff --git a/test/data/strict_atx_heading.md b/tests/data/strict_atx_heading.md
similarity index 100%
rename from test/data/strict_atx_heading.md
rename to tests/data/strict_atx_heading.md
diff --git a/test/data/strikethrough.html b/tests/data/strikethrough.html
similarity index 100%
rename from test/data/strikethrough.html
rename to tests/data/strikethrough.html
diff --git a/test/data/strikethrough.md b/tests/data/strikethrough.md
similarity index 100%
rename from test/data/strikethrough.md
rename to tests/data/strikethrough.md
diff --git a/test/data/strong_em.html b/tests/data/strong_em.html
similarity index 100%
rename from test/data/strong_em.html
rename to tests/data/strong_em.html
diff --git a/test/data/strong_em.md b/tests/data/strong_em.md
similarity index 100%
rename from test/data/strong_em.md
rename to tests/data/strong_em.md
diff --git a/test/data/tab-indented_code_block.html b/tests/data/tab-indented_code_block.html
similarity index 100%
rename from test/data/tab-indented_code_block.html
rename to tests/data/tab-indented_code_block.html
diff --git a/test/data/tab-indented_code_block.md b/tests/data/tab-indented_code_block.md
similarity index 100%
rename from test/data/tab-indented_code_block.md
rename to tests/data/tab-indented_code_block.md
diff --git a/test/data/table_inline_markdown.html b/tests/data/table_inline_markdown.html
similarity index 100%
rename from test/data/table_inline_markdown.html
rename to tests/data/table_inline_markdown.html
diff --git a/test/data/table_inline_markdown.md b/tests/data/table_inline_markdown.md
similarity index 100%
rename from test/data/table_inline_markdown.md
rename to tests/data/table_inline_markdown.md
diff --git a/test/data/text_reference.html b/tests/data/text_reference.html
similarity index 100%
rename from test/data/text_reference.html
rename to tests/data/text_reference.html
diff --git a/test/data/text_reference.md b/tests/data/text_reference.md
similarity index 100%
rename from test/data/text_reference.md
rename to tests/data/text_reference.md
diff --git a/test/data/unordered_list.html b/tests/data/unordered_list.html
similarity index 100%
rename from test/data/unordered_list.html
rename to tests/data/unordered_list.html
diff --git a/test/data/unordered_list.md b/tests/data/unordered_list.md
similarity index 100%
rename from test/data/unordered_list.md
rename to tests/data/unordered_list.md
diff --git a/test/data/untidy_table.html b/tests/data/untidy_table.html
similarity index 100%
rename from test/data/untidy_table.html
rename to tests/data/untidy_table.html
diff --git a/test/data/untidy_table.md b/tests/data/untidy_table.md
similarity index 100%
rename from test/data/untidy_table.md
rename to tests/data/untidy_table.md
diff --git a/test/data/url_autolinking.html b/tests/data/url_autolinking.html
similarity index 100%
rename from test/data/url_autolinking.html
rename to tests/data/url_autolinking.html
diff --git a/test/data/url_autolinking.md b/tests/data/url_autolinking.md
similarity index 100%
rename from test/data/url_autolinking.md
rename to tests/data/url_autolinking.md
diff --git a/test/data/whitespace.html b/tests/data/whitespace.html
similarity index 100%
rename from test/data/whitespace.html
rename to tests/data/whitespace.html
diff --git a/test/data/whitespace.md b/tests/data/whitespace.md
similarity index 100%
rename from test/data/whitespace.md
rename to tests/data/whitespace.md
diff --git a/test/data/xss_attribute_encoding.html b/tests/data/xss_attribute_encoding.html
similarity index 100%
rename from test/data/xss_attribute_encoding.html
rename to tests/data/xss_attribute_encoding.html
diff --git a/test/data/xss_attribute_encoding.md b/tests/data/xss_attribute_encoding.md
similarity index 100%
rename from test/data/xss_attribute_encoding.md
rename to tests/data/xss_attribute_encoding.md
diff --git a/test/data/xss_bad_url.html b/tests/data/xss_bad_url.html
similarity index 100%
rename from test/data/xss_bad_url.html
rename to tests/data/xss_bad_url.html
diff --git a/test/data/xss_bad_url.md b/tests/data/xss_bad_url.md
similarity index 100%
rename from test/data/xss_bad_url.md
rename to tests/data/xss_bad_url.md
diff --git a/test/data/xss_text_encoding.html b/tests/data/xss_text_encoding.html
similarity index 100%
rename from test/data/xss_text_encoding.html
rename to tests/data/xss_text_encoding.html
diff --git a/test/data/xss_text_encoding.md b/tests/data/xss_text_encoding.md
similarity index 100%
rename from test/data/xss_text_encoding.md
rename to tests/data/xss_text_encoding.md