diff --git a/.docs/README.md b/.docs/README.md
index 5e050dd..fa8d5ed 100644
--- a/.docs/README.md
+++ b/.docs/README.md
@@ -12,7 +12,7 @@
 
 ## Benchmark
 
-Average output is ~5ms
+Average output is ~9ms for pdf and ~ 1ms for svg
 
 ## Setup
 
diff --git a/src/DI/InvoiceExtension.php b/src/Bridge/Nette/DI/InvoiceExtension.php
similarity index 89%
rename from src/DI/InvoiceExtension.php
rename to src/Bridge/Nette/DI/InvoiceExtension.php
index 2030d78..905cd6f 100755
--- a/src/DI/InvoiceExtension.php
+++ b/src/Bridge/Nette/DI/InvoiceExtension.php
@@ -1,10 +1,9 @@
 <?php declare(strict_types = 1);
 
-namespace Contributte\Invoice\DI;
+namespace Contributte\Invoice\Bridge\Nette\DI;
 
 use Contributte\Invoice\Data\Account;
 use Contributte\Invoice\Data\Company;
-use Contributte\Invoice\Invoice;
 use Contributte\Invoice\Provider\InvoiceDataProvider;
 use Nette\DI\CompilerExtension;
 use Nette\DI\Definitions\Statement;
@@ -12,7 +11,7 @@
 use Nette\Schema\Schema;
 use stdClass;
 
-class InvoiceExtension extends CompilerExtension
+final class InvoiceExtension extends CompilerExtension
 {
 
 	public function getConfigSchema(): Schema
@@ -42,9 +41,6 @@ public function loadConfiguration(): void
 				$this->getCompany(),
 				$this->getAccounts(),
 			]);
-
-		$builder->addDefinition($this->prefix('invoice'))
-			->setFactory(Invoice::class);
 	}
 
 	private function getCompany(): ?Statement
diff --git a/src/Responses/PdfResponse.php b/src/Bridge/Nette/Response/PdfResponse.php
similarity index 88%
rename from src/Responses/PdfResponse.php
rename to src/Bridge/Nette/Response/PdfResponse.php
index 8362f12..54a041a 100644
--- a/src/Responses/PdfResponse.php
+++ b/src/Bridge/Nette/Response/PdfResponse.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Contributte\Invoice\Responses;
+namespace Contributte\Invoice\Bridge\Nette\Response;
 
 use Nette\Application\Response;
 use Nette\Http\IRequest;
@@ -18,6 +18,7 @@ public function __construct(
 	public function send(IRequest $httpRequest, IResponse $httpResponse): void
 	{
 		$httpResponse->setContentType('application/pdf', 'utf-8');
+
 		echo $this->content;
 	}
 
diff --git a/src/Invoice.php b/src/Invoice.php
deleted file mode 100755
index fc82cf3..0000000
--- a/src/Invoice.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace Contributte\Invoice;
-
-use Contributte\Invoice\Data\IOrder;
-use Contributte\Invoice\Data\Order;
-use Contributte\Invoice\Responses\PdfResponse;
-use Contributte\Invoice\Templates\ITemplate;
-use Contributte\Invoice\Templates\ParaisoTemplate;
-use Nette\Application\Response;
-
-final class Invoice
-{
-
-	private ITemplate $template;
-
-	public function __construct(?ITemplate $template = null)
-	{
-		$this->template = $template ?: new ParaisoTemplate();
-	}
-
-	public function create(IOrder $order): string
-	{
-		return $this->template->render($order);
-	}
-
-	public function send(IOrder $order): void
-	{
-		header('Content-type: application/pdf; charset=utf-8');
-
-		echo $this->create($order);
-	}
-
-	public function createResponse(Order $order): Response
-	{
-		return new PdfResponse($this->create($order));
-	}
-
-	public function withTemplate(ITemplate $template): static
-	{
-		return new static($template);
-	}
-
-}