diff --git a/app/Services/PdfMaker/Designs/Bold.php b/app/Services/PdfMaker/Designs/Bold.php
new file mode 100644
index 000000000000..64b2dec6076a
--- /dev/null
+++ b/app/Services/PdfMaker/Designs/Bold.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker\Designs;
+
+class Bold
+{
+    public function html()
+    {
+        return file_get_contents(
+            base_path('resources/views/pdf-designs//bold.html')
+        );
+    }
+}
diff --git a/app/Services/PdfMaker/Designs/Business.php b/app/Services/PdfMaker/Designs/Business.php
new file mode 100644
index 000000000000..b6c368f5ac2d
--- /dev/null
+++ b/app/Services/PdfMaker/Designs/Business.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker\Designs;
+
+class Business
+{
+    public function html()
+    {
+        return file_get_contents(
+            base_path('resources/views/pdf-designs//business.html')
+        );
+    }
+}
diff --git a/app/Services/PdfMaker/Designs/Clean.php b/app/Services/PdfMaker/Designs/Clean.php
new file mode 100644
index 000000000000..eb621e0ca7fd
--- /dev/null
+++ b/app/Services/PdfMaker/Designs/Clean.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker\Designs;
+
+class Clean
+{
+    public function html()
+    {
+        return file_get_contents(
+            base_path('resources/views/pdf-designs//clean.html')
+        );
+    }
+}
diff --git a/app/Services/PdfMaker/Designs/Creative.php b/app/Services/PdfMaker/Designs/Creative.php
new file mode 100644
index 000000000000..20275744b424
--- /dev/null
+++ b/app/Services/PdfMaker/Designs/Creative.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker\Designs;
+
+class Creative
+{
+    public function html()
+    {
+        return file_get_contents(
+            base_path('resources/views/pdf-designs//creative.html')
+        );
+    }
+}
diff --git a/app/Services/PdfMaker/Designs/Elegant.php b/app/Services/PdfMaker/Designs/Elegant.php
new file mode 100644
index 000000000000..947ffc9ba0b8
--- /dev/null
+++ b/app/Services/PdfMaker/Designs/Elegant.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker\Designs;
+
+class Elegant
+{
+    public function html()
+    {
+        return file_get_contents(
+            base_path('resources/views/pdf-designs//elegant.html')
+        );
+    }
+}
diff --git a/app/Services/PdfMaker/Designs/Hipster.php b/app/Services/PdfMaker/Designs/Hipster.php
new file mode 100644
index 000000000000..d4ff9b42ecd0
--- /dev/null
+++ b/app/Services/PdfMaker/Designs/Hipster.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker\Designs;
+
+class Hipster
+{
+    public function html()
+    {
+        return file_get_contents(
+            base_path('resources/views/pdf-designs//hipster.html')
+        );
+    }
+}
diff --git a/app/Services/PdfMaker/Designs/Modern.php b/app/Services/PdfMaker/Designs/Modern.php
new file mode 100644
index 000000000000..8c4dfec47dc2
--- /dev/null
+++ b/app/Services/PdfMaker/Designs/Modern.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker\Designs;
+
+class Modern
+{
+    public function html()
+    {
+        return file_get_contents(
+            base_path('resources/views/pdf-designs//modern.html')
+        );
+    }
+}
diff --git a/app/Services/PdfMaker/Designs/Plain.php b/app/Services/PdfMaker/Designs/Plain.php
new file mode 100644
index 000000000000..36b6ea628262
--- /dev/null
+++ b/app/Services/PdfMaker/Designs/Plain.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker\Designs;
+
+class Plain
+{
+    public function html()
+    {
+        return file_get_contents(
+            base_path('resources/views/pdf-designs//plain.html')
+        );
+    }
+}
diff --git a/app/Services/PdfMaker/Designs/Playful.php b/app/Services/PdfMaker/Designs/Playful.php
new file mode 100644
index 000000000000..693d32516b5f
--- /dev/null
+++ b/app/Services/PdfMaker/Designs/Playful.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker\Designs;
+
+class Playful
+{
+    public function html()
+    {
+        return file_get_contents(
+            base_path('resources/views/pdf-designs//playful.html')
+        );
+    }
+}
diff --git a/tests/Feature/PdfMaker/PdfMaker.php b/app/Services/PdfMaker/PdfMaker.php
similarity index 79%
rename from tests/Feature/PdfMaker/PdfMaker.php
rename to app/Services/PdfMaker/PdfMaker.php
index 0fff5c4cc95d..0aef04315cbc 100644
--- a/tests/Feature/PdfMaker/PdfMaker.php
+++ b/app/Services/PdfMaker/PdfMaker.php
@@ -1,6 +1,16 @@
 <?php
 
-namespace Tests\Feature\PdfMaker;
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker;
 
 class PdfMaker
 {
diff --git a/tests/Feature/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php
similarity index 92%
rename from tests/Feature/PdfMaker/PdfMakerUtilities.php
rename to app/Services/PdfMaker/PdfMakerUtilities.php
index 6672ffa7b584..174caec83fe9 100644
--- a/tests/Feature/PdfMaker/PdfMakerUtilities.php
+++ b/app/Services/PdfMaker/PdfMakerUtilities.php
@@ -1,6 +1,16 @@
 <?php
 
-namespace Tests\Feature\PdfMaker;
+/**
+ * Invoice Ninja (https://invoiceninja.com)
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Services\PdfMaker;
 
 use DOMDocument;
 use DOMXPath;
diff --git a/tests/Feature/PdfMaker/designs/bold.html b/resources/views/pdf-designs/bold.html
similarity index 100%
rename from tests/Feature/PdfMaker/designs/bold.html
rename to resources/views/pdf-designs/bold.html
diff --git a/tests/Feature/PdfMaker/designs/business.html b/resources/views/pdf-designs/business.html
similarity index 100%
rename from tests/Feature/PdfMaker/designs/business.html
rename to resources/views/pdf-designs/business.html
diff --git a/tests/Feature/PdfMaker/designs/clean.html b/resources/views/pdf-designs/clean.html
similarity index 100%
rename from tests/Feature/PdfMaker/designs/clean.html
rename to resources/views/pdf-designs/clean.html
diff --git a/tests/Feature/PdfMaker/designs/creative.html b/resources/views/pdf-designs/creative.html
similarity index 100%
rename from tests/Feature/PdfMaker/designs/creative.html
rename to resources/views/pdf-designs/creative.html
diff --git a/tests/Feature/PdfMaker/designs/elegant.html b/resources/views/pdf-designs/elegant.html
similarity index 100%
rename from tests/Feature/PdfMaker/designs/elegant.html
rename to resources/views/pdf-designs/elegant.html
diff --git a/tests/Feature/PdfMaker/designs/hipster.html b/resources/views/pdf-designs/hipster.html
similarity index 100%
rename from tests/Feature/PdfMaker/designs/hipster.html
rename to resources/views/pdf-designs/hipster.html
diff --git a/tests/Feature/PdfMaker/designs/modern.html b/resources/views/pdf-designs/modern.html
similarity index 100%
rename from tests/Feature/PdfMaker/designs/modern.html
rename to resources/views/pdf-designs/modern.html
diff --git a/tests/Feature/PdfMaker/designs/plain.html b/resources/views/pdf-designs/plain.html
similarity index 100%
rename from tests/Feature/PdfMaker/designs/plain.html
rename to resources/views/pdf-designs/plain.html
diff --git a/tests/Feature/PdfMaker/designs/playful.html b/resources/views/pdf-designs/playful.html
similarity index 100%
rename from tests/Feature/PdfMaker/designs/playful.html
rename to resources/views/pdf-designs/playful.html
diff --git a/tests/Feature/PdfMaker/Bold.php b/tests/Feature/PdfMaker/Bold.php
deleted file mode 100644
index 9d2840ea4506..000000000000
--- a/tests/Feature/PdfMaker/Bold.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Tests\Feature\PdfMaker;
-
-class Bold
-{
-    public function html()
-    {
-        return file_get_contents(
-            base_path('tests/Feature/PdfMaker/designs/bold.html')
-        );
-    }
-}
diff --git a/tests/Feature/PdfMaker/Business.php b/tests/Feature/PdfMaker/Business.php
deleted file mode 100644
index 1509f69fecc0..000000000000
--- a/tests/Feature/PdfMaker/Business.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Tests\Feature\PdfMaker;
-
-class Business
-{
-    public function html()
-    {
-        return file_get_contents(
-            base_path('tests/Feature/PdfMaker/designs/business.html')
-        );
-    }
-}
diff --git a/tests/Feature/PdfMaker/Clean.php b/tests/Feature/PdfMaker/Clean.php
deleted file mode 100644
index a4768e7da1e1..000000000000
--- a/tests/Feature/PdfMaker/Clean.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Tests\Feature\PdfMaker;
-
-class Clean
-{
-    public function html()
-    {
-        return file_get_contents(
-            base_path('tests/Feature/PdfMaker/designs/clean.html')
-        );
-    }
-}
diff --git a/tests/Feature/PdfMaker/Creative.php b/tests/Feature/PdfMaker/Creative.php
deleted file mode 100644
index 2917013bb4d0..000000000000
--- a/tests/Feature/PdfMaker/Creative.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Tests\Feature\PdfMaker;
-
-class Creative
-{
-    public function html()
-    {
-        return file_get_contents(
-            base_path('tests/Feature/PdfMaker/designs/creative.html')
-        );
-    }
-}
diff --git a/tests/Feature/PdfMaker/Elegant.php b/tests/Feature/PdfMaker/Elegant.php
deleted file mode 100644
index ea600fef2753..000000000000
--- a/tests/Feature/PdfMaker/Elegant.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Tests\Feature\PdfMaker;
-
-class Elegant
-{
-    public function html()
-    {
-        return file_get_contents(
-            base_path('tests/Feature/PdfMaker/designs/elegant.html')
-        );
-    }
-}
diff --git a/tests/Feature/PdfMaker/Modern.php b/tests/Feature/PdfMaker/ExampleDesign.php
similarity index 60%
rename from tests/Feature/PdfMaker/Modern.php
rename to tests/Feature/PdfMaker/ExampleDesign.php
index 046d30436deb..a20d0681a1b3 100644
--- a/tests/Feature/PdfMaker/Modern.php
+++ b/tests/Feature/PdfMaker/ExampleDesign.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Feature\PdfMaker;
 
-class Modern
+class ExampleDesign
 {
     public function html()
     {
         return file_get_contents(
-            base_path('tests/Feature/PdfMaker/designs/modern.html')
+            base_path('tests/Feature/PdfMaker/example-design.html')
         );
     }
-}
+}
\ No newline at end of file
diff --git a/tests/Feature/PdfMaker/Hipster.php b/tests/Feature/PdfMaker/Hipster.php
deleted file mode 100644
index a6b3355bb3cb..000000000000
--- a/tests/Feature/PdfMaker/Hipster.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Tests\Feature\PdfMaker;
-
-class Hipster
-{
-    public function html()
-    {
-        return file_get_contents(
-            base_path('tests/Feature/PdfMaker/designs/hipster.html')
-        );
-    }
-}
diff --git a/tests/Feature/PdfMaker/PdfMakerDesignsTest.php b/tests/Feature/PdfMaker/PdfMakerDesignsTest.php
index 35be2708da65..da5c5da2ed9f 100644
--- a/tests/Feature/PdfMaker/PdfMakerDesignsTest.php
+++ b/tests/Feature/PdfMaker/PdfMakerDesignsTest.php
@@ -2,6 +2,16 @@
 
 namespace Tests\Feature\PdfMaker;
 
+use App\Services\PdfMaker\Designs\Bold;
+use App\Services\PdfMaker\Designs\Business;
+use App\Services\PdfMaker\Designs\Clean;
+use App\Services\PdfMaker\Designs\Creative;
+use App\Services\PdfMaker\Designs\Elegant;
+use App\Services\PdfMaker\Designs\Hipster;
+use App\Services\PdfMaker\Designs\Modern;
+use App\Services\PdfMaker\Designs\Plain;
+use App\Services\PdfMaker\Designs\Playful;
+use App\Services\PdfMaker\PdfMaker;
 use Tests\TestCase;
 
 class PdfMakerDesignsTest extends TestCase
@@ -245,8 +255,7 @@ class PdfMakerDesignsTest extends TestCase
 
         info($maker->getCompiledHTML(true));
 
-                $this->assertTrue(true);
-
+        $this->assertTrue(true);
     }
 
     public function testModern()
@@ -361,8 +370,7 @@ class PdfMakerDesignsTest extends TestCase
 
         info($maker->getCompiledHTML(true));
 
-                $this->assertTrue(true);
-
+        $this->assertTrue(true);
     }
 
 
@@ -478,8 +486,7 @@ class PdfMakerDesignsTest extends TestCase
 
         info($maker->getCompiledHTML(true));
 
-                $this->assertTrue(true);
-
+        $this->assertTrue(true);
     }
 
     public function testPlain()
@@ -586,8 +593,7 @@ class PdfMakerDesignsTest extends TestCase
 
         info($maker->getCompiledHTML(true));
 
-                $this->assertTrue(true);
-
+        $this->assertTrue(true);
     }
 
     public function testHipster()
@@ -698,8 +704,7 @@ class PdfMakerDesignsTest extends TestCase
 
         info($maker->getCompiledHTML(true));
 
-                $this->assertTrue(true);
-
+        $this->assertTrue(true);
     }
 
     public function testElegant()
@@ -814,8 +819,7 @@ class PdfMakerDesignsTest extends TestCase
 
         info($maker->getCompiledHTML(true));
 
-                $this->assertTrue(true);
-
+        $this->assertTrue(true);
     }
 
     public function testCreative()
@@ -930,8 +934,7 @@ class PdfMakerDesignsTest extends TestCase
 
         info($maker->getCompiledHTML(true));
 
-                $this->assertTrue(true);
-
+        $this->assertTrue(true);
     }
 
     public function testPlayful()
@@ -1039,8 +1042,6 @@ class PdfMakerDesignsTest extends TestCase
 
         info($maker->getCompiledHTML(true));
 
-
-                $this->assertTrue(true);
-
+        $this->assertTrue(true);
     }
 }
diff --git a/tests/Feature/PdfMaker/PdfMakerTest.php b/tests/Feature/PdfMaker/PdfMakerTest.php
index 9f5237812512..f29f2eddd39d 100644
--- a/tests/Feature/PdfMaker/PdfMakerTest.php
+++ b/tests/Feature/PdfMaker/PdfMakerTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Feature\PdfMaker;
 
+use App\Services\PdfMaker\PdfMaker;
 use Spatie\Browsershot\Browsershot;
 use Tests\TestCase;
 
@@ -12,18 +13,13 @@ class PdfMakerTest extends TestCase
         'variables' => [],
     ];
 
-    public function setUp() :void
-    {
-         $this->markTestSkipped();
-    }
-
     public function testDesignLoadsCorrectly()
     {
         $maker = new PdfMaker($this->state);
 
-        $maker->design(Business::class);
+        $maker->design(ExampleDesign::class);
 
-        $this->assertInstanceOf(Business::class, $maker->design);
+        $this->assertInstanceOf(ExampleDesign::class, $maker->design);
     }
 
     public function testHtmlDesignLoadsCorrectly()
@@ -31,7 +27,7 @@ class PdfMakerTest extends TestCase
         $maker = new PdfMaker($this->state);
 
         $maker
-            ->design(Business::class)
+            ->design(ExampleDesign::class)
             ->build();
 
         $this->assertStringContainsString('<!-- Business -->', $maker->getCompiledHTML());
@@ -42,7 +38,7 @@ class PdfMakerTest extends TestCase
         $maker = new PdfMaker($this->state);
 
         $maker
-            ->design(Business::class)
+            ->design(ExampleDesign::class)
             ->build();
 
         $this->assertEquals('table', $maker->getSectionNode('product-table')->nodeName);
@@ -73,7 +69,7 @@ class PdfMakerTest extends TestCase
         $maker = new PdfMaker($state);
 
         $maker
-            ->design(Business::class)
+            ->design(ExampleDesign::class)
             ->build();
 
         $this->assertStringContainsString('my-awesome-class', $maker->getSection('product-table', 'class'));
@@ -108,7 +104,7 @@ class PdfMakerTest extends TestCase
         $maker = new PdfMaker($state);
 
         $maker
-            ->design(Business::class)
+            ->design(ExampleDesign::class)
             ->build();
 
         $this->assertStringContainsString('Invoice Ninja', $maker->getCompiledHTML());
@@ -152,7 +148,7 @@ class PdfMakerTest extends TestCase
         $maker = new PdfMaker($state);
 
         $maker
-            ->design(Business::class)
+            ->design(ExampleDesign::class)
             ->build();
 
         $compiled = 'contact@invoiceninja.com';
@@ -172,7 +168,7 @@ class PdfMakerTest extends TestCase
         ]);
 
         $maker1
-            ->design(Business::class)
+            ->design(ExampleDesign::class)
             ->build();
 
         $output1 = $maker1->getCompiledHTML();
@@ -189,7 +185,7 @@ class PdfMakerTest extends TestCase
         ]);
 
         $maker2
-            ->design(Business::class)
+            ->design(ExampleDesign::class)
             ->build();
 
         $output2 = $maker2->getCompiledHTML();
@@ -215,7 +211,7 @@ class PdfMakerTest extends TestCase
         ]);
 
         $maker
-            ->design(Business::class)
+            ->design(ExampleDesign::class)
             ->build();
 
         $node = $maker->getSectionNode('header');
@@ -242,7 +238,7 @@ class PdfMakerTest extends TestCase
         ]);
 
         $maker
-            ->design(Business::class)
+            ->design(ExampleDesign::class)
             ->build();
 
         $node = $maker->getSectionNode('header');
@@ -306,11 +302,9 @@ class PdfMakerTest extends TestCase
         $maker = new PdfMaker($state);
 
         $maker
-            ->design(Business::class)
+            ->design(ExampleDesign::class)
             ->build();
 
-        info($maker->getCompiledHTML());
-
         $this->assertTrue(true);
     }
 }
diff --git a/tests/Feature/PdfMaker/Plain.php b/tests/Feature/PdfMaker/Plain.php
deleted file mode 100644
index d45da833498e..000000000000
--- a/tests/Feature/PdfMaker/Plain.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Tests\Feature\PdfMaker;
-
-class Plain
-{
-    public function html()
-    {
-        return file_get_contents(
-            base_path('tests/Feature/PdfMaker/designs/plain.html')
-        );
-    }
-}
diff --git a/tests/Feature/PdfMaker/Playful.php b/tests/Feature/PdfMaker/Playful.php
deleted file mode 100644
index 650ddc4384c1..000000000000
--- a/tests/Feature/PdfMaker/Playful.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Tests\Feature\PdfMaker;
-
-class Playful
-{
-    public function html()
-    {
-        return file_get_contents(
-            base_path('tests/Feature/PdfMaker/designs/playful.html')
-        );
-    }
-}
diff --git a/tests/Feature/PdfMaker/business.html b/tests/Feature/PdfMaker/example-design.html
similarity index 100%
rename from tests/Feature/PdfMaker/business.html
rename to tests/Feature/PdfMaker/example-design.html