diff --git a/setup_common.py b/buildPy2exe
similarity index 60%
rename from setup_common.py
rename to buildPy2exe
index 5e349a0..9d209e8 100644
--- a/setup_common.py
+++ b/buildPy2exe
@@ -1,7 +1,11 @@
+#!/usr/bin/env python
 #coding:utf8
 
+from setuptools import setup
+import py2exe #@UnusedImport
 from setuptools import find_packages
 import syncplay
+
 common_info = dict(
     name = 'Syncplay',
     version = syncplay.version,
@@ -10,4 +14,12 @@ common_info = dict(
     description = 'Syncplay',
     packages = find_packages(exclude=['venv']),
     install_requires = ['Twisted>=11.1'],
-)
\ No newline at end of file
+)
+
+info = dict(
+    common_info,
+    console = [{"script":"syncplayClient.py","icon_resources":[(1,"icon.ico")]}, 'run_sync_server.py'],
+)
+
+setup(**info)
+
diff --git a/setup_py2exe.py b/setup_py2exe.py
deleted file mode 100644
index 0262fd5..0000000
--- a/setup_py2exe.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-#coding:utf8
-
-from setuptools import setup
-import py2exe
-from setup_common import common_info
-
-info = dict(
-    common_info,
-    console = [{"script":"syncplayClient.py","icon_resources":[(1,"icon.ico")]}, 'run_sync_server.py'],
-)
-
-setup(**info)
-
diff --git a/run_sync_server.py b/syncplayServer.py
old mode 100755
new mode 100644
similarity index 100%
rename from run_sync_server.py
rename to syncplayServer.py