diff --git a/src/__init__.py b/glances/__init__.py
similarity index 100%
rename from src/__init__.py
rename to glances/__init__.py
diff --git a/src/css/default.css b/glances/css/default.css
similarity index 100%
rename from src/css/default.css
rename to glances/css/default.css
diff --git a/src/glances.py b/glances/glances.py
similarity index 100%
rename from src/glances.py
rename to glances/glances.py
diff --git a/src/html/base.html b/glances/html/base.html
similarity index 100%
rename from src/html/base.html
rename to glances/html/base.html
diff --git a/src/html/default.html b/glances/html/default.html
similarity index 100%
rename from src/html/default.html
rename to glances/html/default.html
diff --git a/src/img/bg.png b/glances/img/bg.png
similarity index 100%
rename from src/img/bg.png
rename to glances/img/bg.png
diff --git a/setup.py b/setup.py
index 7090cfef..9fd4b23a 100755
--- a/setup.py
+++ b/setup.py
@@ -8,35 +8,35 @@ from setuptools import setup
 data_files = [
     ('share/man/man1', ['man/glances.1']),
     ('share/doc/glances', ['README',
-        'README-fr',
-        'COPYING',
-        'AUTHORS',
-        'NEWS',
-        'screenshot.png']),
+                           'README-fr',
+                           'COPYING',
+                           'AUTHORS',
+                           'NEWS',
+                           'screenshot.png']),
     ('share/doc/glances/doc', glob('doc/*.png')),
-    ('share/glances/html', glob('src/html/*.html')),
-    ('share/glances/html/css', glob('src/css/*.css')),
-    ('share/glances/html/img', glob('src/img/*.png')),
+    ('share/glances/html', glob('glances/html/*.html')),
+    ('share/glances/css', glob('glances/css/*.css')),
+    ('share/glances/img', glob('glances/img/*.png')),
 ]
+
 for mo in glob('i18n/*/LC_MESSAGES/*.mo'):
     data_files.append((dirname(mo).replace('i18n/', 'share/locale/'), [mo]))
 
 setup(name='Glances',
-    version='1.4',
-    download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.tar.gz',
-    url='https://github.com/nicolargo/glances',
-    description='CLI curses-based monitoring tool',
-    author='Nicolas Hennion',
-    author_email='nicolas@nicolargo.com',
-    license="LGPL",
-    keywords="cli curses monitoring system",
-    long_description=open('README').read(),
-    install_requires=['psutil>=0.4.1'],
-    packages=['glances'],
-     extras_require = {
-        'HTML':  ['jinja2>=2.0'],
-    },
-    include_package_data=True,
-    data_files=data_files,
-    entry_points={"console_scripts": ["glances = glances.glances:main"]},
+      version='1.4',
+      download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.tar.gz',
+      url='https://github.com/nicolargo/glances',
+      description='CLI curses-based monitoring tool',
+      author='Nicolas Hennion',
+      author_email='nicolas@nicolargo.com',
+      license="LGPL",
+      keywords="cli curses monitoring system",
+      long_description=open('README').read(),
+      install_requires=['psutil>=0.4.1'],
+      packages=['glances'],
+      extras_require = {
+          'HTML':  ['jinja2>=2.0'],},
+      include_package_data=True,
+      data_files=data_files,
+      entry_points={"console_scripts": ["glances = glances.glances:main"]},
 )