diff --git a/.gcloudignore b/Server/.gcloudignore
similarity index 100%
rename from .gcloudignore
rename to Server/.gcloudignore
diff --git a/.gitignore b/Server/.gitignore
similarity index 100%
rename from .gitignore
rename to Server/.gitignore
diff --git a/.idea/.gitignore b/Server/.idea/.gitignore
similarity index 100%
rename from .idea/.gitignore
rename to Server/.idea/.gitignore
diff --git a/.idea/ELEC60013-ES-CW1-Server.iml b/Server/.idea/ELEC60013-ES-CW1-Server.iml
similarity index 100%
rename from .idea/ELEC60013-ES-CW1-Server.iml
rename to Server/.idea/ELEC60013-ES-CW1-Server.iml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/Server/.idea/inspectionProfiles/profiles_settings.xml
similarity index 100%
rename from .idea/inspectionProfiles/profiles_settings.xml
rename to Server/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/Server/.idea/misc.xml
similarity index 100%
rename from .idea/misc.xml
rename to Server/.idea/misc.xml
diff --git a/.idea/modules.xml b/Server/.idea/modules.xml
similarity index 100%
rename from .idea/modules.xml
rename to Server/.idea/modules.xml
diff --git a/.idea/vcs.xml b/Server/.idea/vcs.xml
similarity index 100%
rename from .idea/vcs.xml
rename to Server/.idea/vcs.xml
diff --git a/api/authentication.py b/Server/api/authentication.py
similarity index 100%
rename from api/authentication.py
rename to Server/api/authentication.py
diff --git a/api/data.py b/Server/api/data.py
similarity index 100%
rename from api/data.py
rename to Server/api/data.py
diff --git a/app.yaml b/Server/app.yaml
similarity index 100%
rename from app.yaml
rename to Server/app.yaml
diff --git a/config/variables.py b/Server/config/variables.py
similarity index 100%
rename from config/variables.py
rename to Server/config/variables.py
diff --git a/main.py b/Server/main.py
similarity index 100%
rename from main.py
rename to Server/main.py
diff --git a/requirements.txt b/Server/requirements.txt
similarity index 100%
rename from requirements.txt
rename to Server/requirements.txt
diff --git a/lib/utils.py b/lib/utils.py
deleted file mode 100644
index 2488e41..0000000
--- a/lib/utils.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from random import randint
-from flask import current_app
-from flask_mail import Mail, Message
-from firebase_admin import firestore
-
-def sendMail(subject, sender, recipients, body):
-    mail = Mail(current_app)
-    msg = Message(subject, sender=sender, recipients=recipients)
-    msg.body = body
-    mail.send(msg)
-
-def saveVerificationCode(uid):
-    code = randint(100000, 999999)
-    data = {
-        u'code': code
-    }
-    firestore.client().collection(u'verification').document(uid).set(data)
-    return code
-
-def sendVerificationMail(name, email, code):
-    subject = 'Please verify your email for BarkFinder'
-    sender = 'legbarkr@gmail.com'
-    recipients = [email]
-    body = '''Hey {}! Thank you for signing up for BarkFinder.
-               In order to use our sevices, could you please verify your email address by logging in and entering this code {}'''.format(name, code)
-    sendMail(subject, sender, recipients, body)