diff --git a/README.textile b/README.textile
index a99984f..19c236f 100644
--- a/README.textile
+++ b/README.textile
@@ -22,6 +22,18 @@ To run the application just donwload/clone the code, “cd” into the applicati
 
 bc. ./mcg.py
 
+h2. Building
+
+python3 setup.py build
+
+h2. Packaging
+
+python3 setup.py sdist
+
+h2. Installation
+
+python3 setup.py install
+
 h2. Screenshots
 
 !https://www.coderkun.de/images/mcg-cover.png(Cover)!
diff --git a/data/MPDCoverGridGTK.desktop b/data/MPDCoverGridGTK.desktop
index 4390cce..bb1fa64 100644
--- a/data/MPDCoverGridGTK.desktop
+++ b/data/MPDCoverGridGTK.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=MPDCoverGrid (GTK)
-Comment=Covergrid for the Music Player Daemon (GTK)
+Name=MPDCoverGrid
+Comment=Covergrid for the Music Player Daemon
 Type=Application
-Exec=mcgGtk
+Exec=mcg
 Path=
 Categories=AudioVideo;
 StartupNotify=true
diff --git a/mcg.py b/mcg/mcg.py
similarity index 92%
rename from mcg.py
rename to mcg/mcg.py
index 8ff8819..1faade0 100755
--- a/mcg.py
+++ b/mcg/mcg.py
@@ -3,7 +3,6 @@
 """MPDCoverGrid is a client for the Music Player Daemon, focused on albums instead of single tracks."""
 
 
-import os
 import sys
 
 from mcg.application import Application
@@ -11,8 +10,12 @@ from mcg.application import Application
 
 
 
-if __name__ == "__main__":
+def main():
     # Start application
     app = Application()
     exit_status = app.run(sys.argv)
     sys.exit(exit_status)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/setup.py b/setup.py
index d6f7818..f6177bf 100644
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+import os
+
 from setuptools import setup
 
 
@@ -18,24 +20,39 @@ setup(
     packages = [
         "mcg"
     ],
-    scripts = [],
+    package_dir = {
+        'mcg': 'mcg'
+    },
+    package_data = {
+        'mcg': [
+            'LICENSE',
+            'README.textile'
+        ]
+    },
     install_requires = [
-        "python-gobject"
+        "pygobject"
     ],
     extras_require = {
         'keyring support': ["python-keyring"]
     },
     entry_points = {
         "gui_scripts": [
-            "frontend = mcg:main"
+            "mcg = mcg.mcg:main"
         ]
     },
     data_files = [
-        "data/MPDCoverGridGTK.desktop",
-        "data/gschemas.compiled",
-        "data/gtk.glade",
-        "data/mcg.css",
-        "data/noise-texture.png"
+        (os.path.join('share', 'applications'), [
+            "data/MPDCoverGridGTK.desktop"
+        ]),
+        (os.path.join('share', 'glib-2.0', 'schemas'), [
+            "data/de.coderkun.mcg.gschema.xml"
+        ]),
+        (os.path.join('share', 'mcg'), [
+            "data/de.coderkun.mcg.gresource",
+            "data/gtk.glade",
+            "data/mcg.css",
+            "data/noise-texture.png"
+        ])
     ],
     classifiers = [
         "Development Status :: 3 - Alpha",