diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/gitlab renamed to bin/gitlab b/gitlab renamed to bin/gitlab
diff --git a/gitlab.py renamed to gitlab/__init__.py
Lines changed: 1 addition & 1 deletion b/gitlab.py renamed to gitlab/__init__.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎setup.py‎
Lines changed: 8 additions & 9 deletions b/‎setup.py‎
Lines changed: 8 additions & 9 deletions
@@ -1,6 +1,6 @@
 ## Python GitLab
 
-python-gitlab is a Python module providing access to the GitLab server API.
+python-gitlab is a Python package providing access to the GitLab server API.
 
 It supports the v3 api of GitLab.
 
 
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-""" Module for interfacing with GitLab-api """
+"""Package for interfacing with GitLab-api """
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
 
@@ -3,14 +3,13 @@
 
 from setuptools import setup
 
+import gitlab
+
+
 def get_version():
-    f = open('gitlab.py')
-    try:
-        for line in f:
-            if line.startswith('__version__'):
-                return eval(line.split('=')[-1])
-    finally:
-        f.close()
+
+    return gitlab.__version__
+
 
 setup(name='python-gitlab',
       version=get_version(),
@@ -20,8 +19,8 @@ def get_version():
       author_email='gauvain@pocentek.net',
       license='LGPLv3',
       url='https://github.com/gpocentek/python-gitlab',
-      py_modules=['gitlab'],
-      scripts=['gitlab'],
+      packages=['gitlab'],
+      scripts=['bin/gitlab'],
       install_requires=['requests', 'six'],
       classifiers=[
         'Development Status :: 5 - Production/Stable',
Original file line number	Diff line number	Diff line change
@@ -14,7 +14,7 @@
14	14	#
15	15	# You should have received a copy of the GNU Lesser General Public License
16	16	# along with this program. If not, see <http://www.gnu.org/licenses/>.
17		- """ Module for interfacing with GitLab-api """
	17	+ """Package for interfacing with GitLab-api """
18	18	from __future__ import print_function
19	19	from __future__ import division
20	20	from __future__ import absolute_import