diff --git a/.coverage b/.coverage
index 98b40d1..10fbdc7 100644
Binary files a/.coverage and b/.coverage differ
diff --git a/party/__init__.py b/party/__init__.py
index 04e1107..d406c0e 100644
--- a/party/__init__.py
+++ b/party/__init__.py
@@ -1,85 +1,7 @@
-from flask import Flask, jsonify
-
+import party.main as main
 
 def create_app():
-    app = Flask(__name__)
+    return main.app
 
-    @app.route('/', methods=['GET'])
-    def index():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api', methods=['GET'])
-    def api():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/mate', methods=['GET'])
-    def api_mate():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/mate/status', methods=['GET'])
-    def api_mate_status():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/mate/trinken', methods=['POST'])
-    def api_mate_trinken():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/chat/', methods=['GET'])
-    def api_chat():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/chat/messages/<count>', methods=['GET'])
-    def api_chat_messages_1(count):
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/chat/messages/<count>/<offset>', methods=['GET'])
-    def api_chat_messages_2(count, offset):
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/chat/new_message', methods=['POST'])
-    def api_chat_new_message():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/music', methods=['GET'])
-    def api_music():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/music/skip', methods=['POST'])
-    def api_music_skip():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/music/queue', methods=['GET'])
-    def api_music_queue():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    @app.route('/api/music/add_song', methods=['POST'])
-    def api_music_add_song():
-        response = jsonify(success=True)
-        response.status_code = 200
-        return response
-
-    return app
+if __name__ == '__main__':
+    create_app().run(debug=True, host='localhost', port=5000) #pragma: no cover
diff --git a/party/main.py b/party/main.py
index 5700cea..43f5102 100644
--- a/party/main.py
+++ b/party/main.py
@@ -1,5 +1,81 @@
-from party import create_app
+from flask import Flask, jsonify
 
+app = Flask(__name__)
 
-if __name__ == '__main__':
-    create_app().run(debug=True, host='localhost', port=5000)
+@app.route('/', methods=['GET'])
+def index():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api', methods=['GET'])
+def api():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/mate', methods=['GET'])
+def api_mate():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/mate/status', methods=['GET'])
+def api_mate_status():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/mate/trinken', methods=['POST'])
+def api_mate_trinken():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/chat/', methods=['GET'])
+def api_chat():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/chat/messages/<count>', methods=['GET'])
+def api_chat_messages_1(count):
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/chat/messages/<count>/<offset>', methods=['GET'])
+def api_chat_messages_2(count, offset):
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/chat/new_message', methods=['POST'])
+def api_chat_new_message():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/music', methods=['GET'])
+def api_music():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/music/skip', methods=['POST'])
+def api_music_skip():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/music/queue', methods=['GET'])
+def api_music_queue():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response
+
+@app.route('/api/music/add_song', methods=['POST'])
+def api_music_add_song():
+    response = jsonify(success=True)
+    response.status_code = 200
+    return response