diff --git a/.gitignore b/.gitignore
index 972062a..78f2387 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 env/
-.vscode/
\ No newline at end of file
+.vscode/
+*.pyc
\ No newline at end of file
diff --git a/dnspy3-server.py b/dnspy3-server.py
index cb3361f..2af43b2 100644
--- a/dnspy3-server.py
+++ b/dnspy3-server.py
@@ -1,43 +1,16 @@
 from flask import Flask, request
 from flask_restful import Resource, Api
+import utils
 import json
 
 app = Flask(__name__)
 api = Api(app)
 
 
-class WhoIS():
-    def __init__(self, domain):
-        self.domain = domain
-        self.getWhois()
-
-    def getWhois(self):
-        self.registrar = 'Synergy Wholesale'
-        self.status = ['clientDeleteProhibited https://icann.org/epp#clientDeleteProhibited', 'clientTransferProhibited https://icann.org/epp#clientTransferProhibited', 'clientUpdateProhibited https://icann.org/epp#clientUpdateProhibited',
-                       'serverDeleteProhibited https://icann.org/epp#serverDeleteProhibited', 'serverTransferProhibited https://icann.org/epp#serverTransferProhibited', 'serverUpdateProhibited https://icann.org/epp#serverUpdateProhibited']
-        self.registrant = {'name': 'Test Case', 'email': 'tcase@test.com',
-                           'eligibilitytype': 'Company', 'eligibilityid': '123456789'}
-        self.nameservers = ['ns1.dommain.tld', 'ns2.domain.tld']
-
-
-class DNS():
-    def __init__(self, domain):
-        self.domain = domain
-        self.getRecords()
-
-    def getRecords(self):
-        self.a = '1.2.3.4'
-        self.aaaa = '2001:0db8:85a3:0000:0000:8a2e:0370:7334'
-        self.mx = {'mail.domain.tld': 10}
-        self.txt = 'v=spf1 +a +mx +include:spf.hostingplatform.net.au'
-        self.ns = ['ns1.domain.tld', 'ns2.domain.tld']
-        self.soa = 'ns1.domain.tld. webmaster.domain.tld. 310875860 900 900 1800 60'
-
-
 class Domain():
     def __init__(self, domain):
-        self.whois = WhoIS(domain).__dict__
-        self.dns = DNS(domain).__dict__
+        self.whois = utils.whois.WhoIS(domain).__dict__
+        self.dns = utils.dns.DNS(domain).__dict__
 
 
 class DNSLookup(Resource):
@@ -55,6 +28,8 @@ class DNSLookup(Resource):
 
 api.add_resource(DNSLookup, '/lookup', '/lookup/<string:domain>')
 
+print(dir())
+
 
 @app.route('/')
 def index():
diff --git a/utils/__init__.py b/utils/__init__.py
new file mode 100644
index 0000000..54f4c73
--- /dev/null
+++ b/utils/__init__.py
@@ -0,0 +1,2 @@
+from . import dns
+from . import whois
diff --git a/utils/dns.py b/utils/dns.py
new file mode 100644
index 0000000..ca1c596
--- /dev/null
+++ b/utils/dns.py
@@ -0,0 +1,12 @@
+class DNS():
+    def __init__(self, domain):
+        self.domain = domain
+        self.getRecords()
+
+    def getRecords(self):
+        self.a = '1.2.3.4'
+        self.aaaa = '2001:0db8:85a3:0000:0000:8a2e:0370:7334'
+        self.mx = {'mail.domain.tld': 10}
+        self.txt = 'v=spf1 +a +mx +include:spf.hostingplatform.net.au'
+        self.ns = ['ns1.domain.tld', 'ns2.domain.tld']
+        self.soa = 'ns1.domain.tld. webmaster.domain.tld. 310875860 900 900 1800 60'
diff --git a/utils/whois.py b/utils/whois.py
new file mode 100644
index 0000000..adccd88
--- /dev/null
+++ b/utils/whois.py
@@ -0,0 +1,12 @@
+class WhoIS():
+    def __init__(self, domain):
+        self.domain = domain
+        self.getWhois()
+
+    def getWhois(self):
+        self.registrar = 'Synergy Wholesale'
+        self.status = ['clientDeleteProhibited https://icann.org/epp#clientDeleteProhibited', 'clientTransferProhibited https://icann.org/epp#clientTransferProhibited', 'clientUpdateProhibited https://icann.org/epp#clientUpdateProhibited',
+                       'serverDeleteProhibited https://icann.org/epp#serverDeleteProhibited', 'serverTransferProhibited https://icann.org/epp#serverTransferProhibited', 'serverUpdateProhibited https://icann.org/epp#serverUpdateProhibited']
+        self.registrant = {'name': 'Test Case', 'email': 'tcase@test.com',
+                           'eligibilitytype': 'Company', 'eligibilityid': '123456789'}
+        self.nameservers = ['ns1.dommain.tld', 'ns2.domain.tld']