diff --git a/.gitignore b/.gitignore
index edc2383..b355436 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-# Backup files
-*~
-
-# Compiled Python files
+__pycache__/
 *.py[cod]
+
+build/
+dist/
+MANIFEST
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..9d5d250
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,2 @@
+include LICENSE
+include README.rst
diff --git a/README.md b/README.rst
similarity index 85%
rename from README.md
rename to README.rst
index 85a1b97..e6d9141 100644
--- a/README.md
+++ b/README.rst
@@ -15,16 +15,16 @@ Requirements
 Usage
 -----
 
-If you want to use systemctl without password prompt, you should add this line to /etc/sudoers (use visudo command for it):
+If you want to use systemctl without password prompt, you should add this line to /etc/sudoers (use visudo command for it)::
 
     %wheel ALL=(ALL) NOPASSWD: /usr/bin/systemctl
 
-And then add yourself to wheel group:
+And then add yourself to wheel group::
 
     gpasswd -a your_username wheel
 
 An alternative is to use kdesu instead of sudo (set this in QOpenVPN settings), but then you have to use password for every operation.
 
-You should also add yourself to adm group for log viewer to work:
+You should also add yourself to adm group for log viewer to work::
 
     gpasswd -a your_username adm
diff --git a/qopenvpn/qopenvpn.py b/qopenvpn/__main__.py
similarity index 100%
rename from qopenvpn/qopenvpn.py
rename to qopenvpn/__main__.py
diff --git a/scripts/qopenvpn b/scripts/qopenvpn
index 2c9b1e1..e34c12d 100755
--- a/scripts/qopenvpn
+++ b/scripts/qopenvpn
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-from qopenvpn import qopenvpn
-qopenvpn.main()
+from qopenvpn import __main__
+__main__.main()
diff --git a/setup.py b/setup.py
index 2124e58..30b2ff0 100755
--- a/setup.py
+++ b/setup.py
@@ -15,4 +15,16 @@
       data_files=[("share/applications", ["qopenvpn.desktop"]),
                   ("share/pixmaps", ["qopenvpn.png"])],
       scripts=["scripts/qopenvpn"],
-      requires=["PyQt4"])
+      requires=["PyQt4"],
+      classifiers=[
+          'Development Status :: 5 - Production/Stable',
+          'Environment :: X11 Applications :: Qt',
+          'Intended Audience :: End Users/Desktop',
+          'Intended Audience :: System Administrators',
+          'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+          'Natural Language :: English',
+          'Operating System :: POSIX :: Linux',
+          'Programming Language :: Python :: 3',
+          'Topic :: Security :: Cryptography',
+          'Topic :: System :: Networking'
+    ])