diff --git a/abp/server.py b/bin/abpserver
old mode 100644
new mode 100755
similarity index 93%
rename from abp/server.py
rename to bin/abpserver
index f220075..bb016d7
--- a/abp/server.py
+++ b/bin/abpserver
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 from websocket_server import WebsocketServer
 from SimpleHTTPServer import SimpleHTTPRequestHandler
 from BaseHTTPServer import HTTPServer
@@ -5,9 +6,11 @@ from SocketServer import ThreadingMixIn
 import os, sys, threading
 import webbrowser
 import argparse
+import abp
 
 clients = []
 
+
 def new_message(client, server, message):
     print "Received update from client {}.".format(client["id"])
     server.send_message_to_all(message)
@@ -29,7 +32,7 @@ if __name__ == '__main__':
     args = parser.parse_args()
 
     # Change to the right working dir
-    where = os.path.join(sys.path[0], "../static")
+    where = os.path.join(os.path.dirname(abp.__path__[0]), "static")
     os.chdir(where)
 
     # Start the HTTP server
diff --git a/setup.py b/setup.py
index 178d5dd..52bb181 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,11 @@
 from setuptools import setup, find_packages
+from glob import glob
+from os import path
+
+APPNAME = "abp"
+STATIC = glob("static/*.*")+glob("static/img/*.*")+glob("static/scripts/*.*")
+appdata = path.expanduser(path.join("~", "." + APPNAME))
+print appdata
 
 setup(
     name = "abp",
@@ -9,5 +16,7 @@ setup(
     description = "Port of C++ due to Simon Anders and Hans J Briegel",
     keywords = "quantum",
     setup_requires = ["numpy"],
+    scripts = ["bin/abpserver"],
     install_requires = ["numpy", "networkx", "tqdm", "websocket-client", "websocket-server"],
+    data_files = [("static", STATIC)]
 )