diff --git a/.cache/.gitkeep b/.cache/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/lib/tftp.php b/lib/tftp.php
index 9fa0621..88459c1 100644
--- a/lib/tftp.php
+++ b/lib/tftp.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+namespace SCCP\TFTP;
 /*
  * PHP TFTP Server
  *
diff --git a/lib/utils.php b/lib/utils.php
index c93767f..c2b93ca 100644
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -2,11 +2,12 @@
 //
 // Helper functions
 //
+declare(strict_types=1);
 namespace SCCP\Utils;
 
 function utf8_urldecode($str) {
 	$str = preg_replace("/%u([0-9a-f]{3,4})/i","&#x\\1;",urldecode($str));
-	return html_entity_decode($str,null,'UTF-8');;
+	return html_entity_decode($str,0,'UTF-8');;
 }
 
 function log_debug($message) {
diff --git a/srv/tftp/tftp_provisioner b/srv/tftp/tftp_provisioner
index a33f692..fff9e3d 100755
--- a/srv/tftp/tftp_provisioner
+++ b/srv/tftp/tftp_provisioner
@@ -1,10 +1,14 @@
 #!/usr/bin/env php
 <?php
+declare(strict_types=1);
+
 require_once("lib/tftp.php");
 require_once("lib/config.php");
 require_once("lib/resolver.php");
 
-class TFTPProvisioner extends TFTPServer
+use SCCP\TFTP as TFTP;
+use SCCP\Resolve as Resolve;
+class TFTPProvisioner extends TFTP\TFTPServer
 {
   private $_debug;
   private $_resolver;
@@ -19,7 +23,7 @@ class TFTPProvisioner extends TFTPServer
     parent::__construct($server_url, $logger);
     $this->_debug = $debug;
     $this->max_put_size = 60000000;
-    $this->_resolver = new Resolver($config);
+    $this->_resolver = new Resolve\Resolver($config);
     $this->_settings_path = $this->_config['main']['base_path'] . DIRECTORY_SEPARATOR
                 . $this->_config['subdirs']['settings']['path'] . DIRECTORY_SEPARATOR;
   }