diff --git a/.gitignore b/.gitignore
index a10fb49..2bad5ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.pyc
-data/inputs/*
-data/*.avi
+ivolution/*.pyc
+ivolution/data/inputs/*
+ivolution/data/*.avi
 build
 dist
 MANIFEST
@@ -8,5 +9,4 @@ packaging
 doc/build
 *~
 README.rst
-test.py
 log
diff --git a/AUTHORS b/AUTHORS
index 3a7851e..0a545da 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1 @@
-Copyright (C) 2012 <Julien Lengrand-Lambert> <jlengrand@gmail.com>
+Copyright (C) 2012 <Julien Lengrand-Lambert> <julien@lengrand.fr>
diff --git a/bin/Ivolution.py b/Ivolution.py
similarity index 50%
rename from bin/Ivolution.py
rename to Ivolution.py
index 8f696e8..6d1a231 100755
--- a/bin/Ivolution.py
+++ b/Ivolution.py
@@ -1,11 +1,7 @@
 #!/usr/bin/env python
 
-import os
-parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-os.sys.path.insert(0,parentdir) 
-
 from gi.repository import Gtk, GObject
-from gui import IvolutionWindow
+from ivolution.gui import IvolutionWindow
 
 
 my_app = IvolutionWindow.IvolutionWindow("Ivolution")
diff --git a/MANIFEST.in b/MANIFEST.in
index 832664c..1df50a9 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,9 +1,7 @@
 recursive-include log *
 recursive-include bin *
-recursive-include data/inputs/sample-test *
-recursive-include data/media *
-recursive-include data/ui *
-recursive-include haarcascades *.xml
 recursive-include docs *
 include LICENSE
-include README*
\ No newline at end of file
+include README*
+include AUTHORS
+include CHANGES
\ No newline at end of file
diff --git a/facemovie/Eye.py b/ivolution/Eye.py
similarity index 100%
rename from facemovie/Eye.py
rename to ivolution/Eye.py
diff --git a/facemovie/Face.py b/ivolution/Face.py
similarity index 100%
rename from facemovie/Face.py
rename to ivolution/Face.py
diff --git a/facemovie/FaceParams.py b/ivolution/FaceParams.py
similarity index 100%
rename from facemovie/FaceParams.py
rename to ivolution/FaceParams.py
diff --git a/facemovie/FacemovieThread.py b/ivolution/FacemovieThread.py
similarity index 95%
rename from facemovie/FacemovieThread.py
rename to ivolution/FacemovieThread.py
index 69c417a..4836c81 100644
--- a/facemovie/FacemovieThread.py
+++ b/ivolution/FacemovieThread.py
@@ -6,19 +6,13 @@
 .. moduleauthor:: Julien Lengrand-Lambert <jlengrand@gmail.com>
 
 """
-import os
-parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-os.sys.path.insert(0,parentdir) # import parent folder
-
 import sys
 import threading
 import time
 
-#from gui import IvolutionWindow
-
 import logging
 
-from facemovie import Facemovie_lib
+import Facemovie_lib
 
 class Observer():
     """
diff --git a/facemovie/Facemovie_lib.py b/ivolution/Facemovie_lib.py
similarity index 99%
rename from facemovie/Facemovie_lib.py
rename to ivolution/Facemovie_lib.py
index 9282475..a5a9b8c 100644
--- a/facemovie/Facemovie_lib.py
+++ b/ivolution/Facemovie_lib.py
@@ -14,7 +14,7 @@ import logging
 
 import cv
 
-from lib import exif
+from util import exif
 import Guy
 
 class FaceMovie(object):
diff --git a/facemovie/Guy.py b/ivolution/Guy.py
similarity index 100%
rename from facemovie/Guy.py
rename to ivolution/Guy.py
diff --git a/facemovie/__init__.py b/ivolution/__init__.py
similarity index 100%
rename from facemovie/__init__.py
rename to ivolution/__init__.py
diff --git a/gui/__init__.py b/ivolution/data/haarcascades/__init__.py
old mode 100755
new mode 100644
similarity index 100%
rename from gui/__init__.py
rename to ivolution/data/haarcascades/__init__.py
diff --git a/haarcascades/haarcascade_eye.xml b/ivolution/data/haarcascades/haarcascade_eye.xml
similarity index 100%
rename from haarcascades/haarcascade_eye.xml
rename to ivolution/data/haarcascades/haarcascade_eye.xml
diff --git a/haarcascades/haarcascade_eye_tree_eyeglasses.xml b/ivolution/data/haarcascades/haarcascade_eye_tree_eyeglasses.xml
similarity index 100%
rename from haarcascades/haarcascade_eye_tree_eyeglasses.xml
rename to ivolution/data/haarcascades/haarcascade_eye_tree_eyeglasses.xml
diff --git a/haarcascades/haarcascade_frontalface_alt.xml b/ivolution/data/haarcascades/haarcascade_frontalface_alt.xml
similarity index 100%
rename from haarcascades/haarcascade_frontalface_alt.xml
rename to ivolution/data/haarcascades/haarcascade_frontalface_alt.xml
diff --git a/haarcascades/haarcascade_frontalface_alt2.xml b/ivolution/data/haarcascades/haarcascade_frontalface_alt2.xml
similarity index 100%
rename from haarcascades/haarcascade_frontalface_alt2.xml
rename to ivolution/data/haarcascades/haarcascade_frontalface_alt2.xml
diff --git a/haarcascades/haarcascade_frontalface_alt_tree.xml b/ivolution/data/haarcascades/haarcascade_frontalface_alt_tree.xml
similarity index 100%
rename from haarcascades/haarcascade_frontalface_alt_tree.xml
rename to ivolution/data/haarcascades/haarcascade_frontalface_alt_tree.xml
diff --git a/haarcascades/haarcascade_frontalface_default.xml b/ivolution/data/haarcascades/haarcascade_frontalface_default.xml
similarity index 100%
rename from haarcascades/haarcascade_frontalface_default.xml
rename to ivolution/data/haarcascades/haarcascade_frontalface_default.xml
diff --git a/haarcascades/haarcascade_fullbody.xml b/ivolution/data/haarcascades/haarcascade_fullbody.xml
similarity index 100%
rename from haarcascades/haarcascade_fullbody.xml
rename to ivolution/data/haarcascades/haarcascade_fullbody.xml
diff --git a/haarcascades/haarcascade_lefteye_2splits.xml b/ivolution/data/haarcascades/haarcascade_lefteye_2splits.xml
similarity index 100%
rename from haarcascades/haarcascade_lefteye_2splits.xml
rename to ivolution/data/haarcascades/haarcascade_lefteye_2splits.xml
diff --git a/haarcascades/haarcascade_lowerbody.xml b/ivolution/data/haarcascades/haarcascade_lowerbody.xml
similarity index 100%
rename from haarcascades/haarcascade_lowerbody.xml
rename to ivolution/data/haarcascades/haarcascade_lowerbody.xml
diff --git a/haarcascades/haarcascade_mcs_eyepair_big.xml b/ivolution/data/haarcascades/haarcascade_mcs_eyepair_big.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_eyepair_big.xml
rename to ivolution/data/haarcascades/haarcascade_mcs_eyepair_big.xml
diff --git a/haarcascades/haarcascade_mcs_eyepair_small.xml b/ivolution/data/haarcascades/haarcascade_mcs_eyepair_small.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_eyepair_small.xml
rename to ivolution/data/haarcascades/haarcascade_mcs_eyepair_small.xml
diff --git a/haarcascades/haarcascade_mcs_leftear.xml b/ivolution/data/haarcascades/haarcascade_mcs_leftear.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_leftear.xml
rename to ivolution/data/haarcascades/haarcascade_mcs_leftear.xml
diff --git a/haarcascades/haarcascade_mcs_lefteye.xml b/ivolution/data/haarcascades/haarcascade_mcs_lefteye.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_lefteye.xml
rename to ivolution/data/haarcascades/haarcascade_mcs_lefteye.xml
diff --git a/haarcascades/haarcascade_mcs_mouth.xml b/ivolution/data/haarcascades/haarcascade_mcs_mouth.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_mouth.xml
rename to ivolution/data/haarcascades/haarcascade_mcs_mouth.xml
diff --git a/haarcascades/haarcascade_mcs_nose.xml b/ivolution/data/haarcascades/haarcascade_mcs_nose.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_nose.xml
rename to ivolution/data/haarcascades/haarcascade_mcs_nose.xml
diff --git a/haarcascades/haarcascade_mcs_rightear.xml b/ivolution/data/haarcascades/haarcascade_mcs_rightear.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_rightear.xml
rename to ivolution/data/haarcascades/haarcascade_mcs_rightear.xml
diff --git a/haarcascades/haarcascade_mcs_righteye.xml b/ivolution/data/haarcascades/haarcascade_mcs_righteye.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_righteye.xml
rename to ivolution/data/haarcascades/haarcascade_mcs_righteye.xml
diff --git a/haarcascades/haarcascade_mcs_upperbody.xml b/ivolution/data/haarcascades/haarcascade_mcs_upperbody.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_upperbody.xml
rename to ivolution/data/haarcascades/haarcascade_mcs_upperbody.xml
diff --git a/haarcascades/haarcascade_profileface.xml b/ivolution/data/haarcascades/haarcascade_profileface.xml
similarity index 100%
rename from haarcascades/haarcascade_profileface.xml
rename to ivolution/data/haarcascades/haarcascade_profileface.xml
diff --git a/haarcascades/haarcascade_righteye_2splits.xml b/ivolution/data/haarcascades/haarcascade_righteye_2splits.xml
similarity index 100%
rename from haarcascades/haarcascade_righteye_2splits.xml
rename to ivolution/data/haarcascades/haarcascade_righteye_2splits.xml
diff --git a/haarcascades/haarcascade_upperbody.xml b/ivolution/data/haarcascades/haarcascade_upperbody.xml
similarity index 100%
rename from haarcascades/haarcascade_upperbody.xml
rename to ivolution/data/haarcascades/haarcascade_upperbody.xml
diff --git a/data/media/441px-Da_Vinci_Vitruve_Luc_Viatour.jpg b/ivolution/data/media/441px-Da_Vinci_Vitruve_Luc_Viatour.jpg
similarity index 100%
rename from data/media/441px-Da_Vinci_Vitruve_Luc_Viatour.jpg
rename to ivolution/data/media/441px-Da_Vinci_Vitruve_Luc_Viatour.jpg
diff --git a/data/media/background.png b/ivolution/data/media/background.png
similarity index 100%
rename from data/media/background.png
rename to ivolution/data/media/background.png
diff --git a/data/media/credits b/ivolution/data/media/credits
similarity index 100%
rename from data/media/credits
rename to ivolution/data/media/credits
diff --git a/data/media/ivolution.svg b/ivolution/data/media/ivolution.svg
similarity index 100%
rename from data/media/ivolution.svg
rename to ivolution/data/media/ivolution.svg
diff --git a/data/media/vitruve.jpg b/ivolution/data/media/vitruve.jpg
similarity index 100%
rename from data/media/vitruve.jpg
rename to ivolution/data/media/vitruve.jpg
diff --git a/data/media/vitruve.png b/ivolution/data/media/vitruve.png
similarity index 100%
rename from data/media/vitruve.png
rename to ivolution/data/media/vitruve.png
diff --git a/data/media/vitruve.svg b/ivolution/data/media/vitruve.svg
similarity index 100%
rename from data/media/vitruve.svg
rename to ivolution/data/media/vitruve.svg
diff --git a/data/media/vitruve1282.png b/ivolution/data/media/vitruve1282.png
similarity index 100%
rename from data/media/vitruve1282.png
rename to ivolution/data/media/vitruve1282.png
diff --git a/data/media/vitruve162.png b/ivolution/data/media/vitruve162.png
similarity index 100%
rename from data/media/vitruve162.png
rename to ivolution/data/media/vitruve162.png
diff --git a/data/media/vitruve322.png b/ivolution/data/media/vitruve322.png
similarity index 100%
rename from data/media/vitruve322.png
rename to ivolution/data/media/vitruve322.png
diff --git a/data/media/vitruve642.png b/ivolution/data/media/vitruve642.png
similarity index 100%
rename from data/media/vitruve642.png
rename to ivolution/data/media/vitruve642.png
diff --git a/data/media/vitruve_128.png b/ivolution/data/media/vitruve_128.png
similarity index 100%
rename from data/media/vitruve_128.png
rename to ivolution/data/media/vitruve_128.png
diff --git a/data/media/vitruve_16.png b/ivolution/data/media/vitruve_16.png
similarity index 100%
rename from data/media/vitruve_16.png
rename to ivolution/data/media/vitruve_16.png
diff --git a/data/media/vitruve_32.png b/ivolution/data/media/vitruve_32.png
similarity index 100%
rename from data/media/vitruve_32.png
rename to ivolution/data/media/vitruve_32.png
diff --git a/data/media/vitruve_50.jpg b/ivolution/data/media/vitruve_50.jpg
similarity index 100%
rename from data/media/vitruve_50.jpg
rename to ivolution/data/media/vitruve_50.jpg
diff --git a/data/media/vitruve_64.png b/ivolution/data/media/vitruve_64.png
similarity index 100%
rename from data/media/vitruve_64.png
rename to ivolution/data/media/vitruve_64.png
diff --git a/data/ui/AboutIvolutionDialog.glade b/ivolution/data/ui/AboutIvolutionDialog.glade
similarity index 100%
rename from data/ui/AboutIvolutionDialog.glade
rename to ivolution/data/ui/AboutIvolutionDialog.glade
diff --git a/data/ui/IvolutionWindow.glade b/ivolution/data/ui/IvolutionWindow.glade
similarity index 100%
rename from data/ui/IvolutionWindow.glade
rename to ivolution/data/ui/IvolutionWindow.glade
diff --git a/gui/AboutDialog.py b/ivolution/gui/AboutDialog.py
similarity index 84%
rename from gui/AboutDialog.py
rename to ivolution/gui/AboutDialog.py
index aa10ed9..8e2047e 100755
--- a/gui/AboutDialog.py
+++ b/ivolution/gui/AboutDialog.py
@@ -1,6 +1,5 @@
 from gi.repository import Gtk
 
-
 class AboutDialog():
 
     def __init__(self):
@@ -10,7 +9,7 @@ class AboutDialog():
         Returns a fully instantiated AboutDialog object.
         """
         self.builder = Gtk.Builder()
-        self.builder.add_from_file("data/ui/AboutIvolutionDialog.glade")
+        self.builder.add_from_file("ivolution/data/ui/AboutIvolutionDialog.glade")
         self.window = self.builder.get_object("about_ivolution_dialog")           
 
         self.window.run()
diff --git a/gui/IvolutionWindow.py b/ivolution/gui/IvolutionWindow.py
similarity index 97%
rename from gui/IvolutionWindow.py
rename to ivolution/gui/IvolutionWindow.py
index 5196146..fdf7095 100755
--- a/gui/IvolutionWindow.py
+++ b/ivolution/gui/IvolutionWindow.py
@@ -14,9 +14,9 @@ import os
 parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 os.sys.path.insert(0,parentdir) # import parent folder
 
-from facemovie import Facemovie_lib
-from facemovie import FaceParams
-from facemovie import FacemovieThread
+import Facemovie_lib
+import FaceParams
+import FacemovieThread
 
 import time
 
@@ -29,7 +29,7 @@ class IvolutionWindow(FacemovieThread.Observer, FacemovieThread.Observable):
         self.console_logger = None
 
         self.builder = Gtk.Builder()
-        self.builder.add_from_file("data/ui/IvolutionWindow.glade")
+        self.builder.add_from_file("ivolution/data/ui/IvolutionWindow.glade")
         #self.builder.connect_signals({ "on_ivolutionwindow_destroy" : Gtk.main_quit })
         self.window = self.builder.get_object("ivolution_window")
         self.window.show()
@@ -161,7 +161,7 @@ class IvolutionWindow(FacemovieThread.Observer, FacemovieThread.Observable):
         self.speed = self.speedcombobox.get_active() # We need and integer between 0 and 2
 
         # Instantiating the face_params object that will be needed by the facemovie
-        par_fo = os.path.join(self.root_fo, "haarcascades")
+        par_fo = os.path.join(self.root_fo, "ivolution/data/haarcascades")
         self.face_params = FaceParams.FaceParams(par_fo,
                                                 self.in_fo,
                                                 self.out_fo,
diff --git a/haarcascades/__init__.py b/ivolution/gui/__init__.py
old mode 100644
new mode 100755
similarity index 100%
rename from haarcascades/__init__.py
rename to ivolution/gui/__init__.py
diff --git a/facemovie/training_types.py b/ivolution/training_types.py
similarity index 100%
rename from facemovie/training_types.py
rename to ivolution/training_types.py
diff --git a/facemovie/lib/__init__.py b/ivolution/util/__init__.py
similarity index 100%
rename from facemovie/lib/__init__.py
rename to ivolution/util/__init__.py
diff --git a/facemovie/lib/exif.py b/ivolution/util/exif.py
similarity index 100%
rename from facemovie/lib/exif.py
rename to ivolution/util/exif.py
diff --git a/setup.py b/setup.py
index a7ee55c..846aac6 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def find_data_files(source,target,patterns):
     """
     if glob.has_magic(source) or glob.has_magic(target):
         raise ValueError("Magic not allowed in src, target")
-    ret = {}
+    ret = {}l
     for pattern in patterns:
         pattern = os.path.join(source,pattern)
         for filename in glob.glob(pattern):
@@ -40,17 +40,23 @@ def read(fname):
 
 haar_files = find_data_files('facemovie','',['haarcascades/*.xml'])   
 
+setup(...,
+      packages=['mypkg'],
+      package_dir={'mypkg': 'src/mypkg'},
+      package_data={'mypkg': ['data/*.dat']},
+      )
+
 setup(
-    name = "Facemovie",
+    name = "Ivolution",
     version = "1.0",
     author = "Julien Lengrand-Lambert",
-    author_email = "jlengrand@gmail.com",
+    author_email = "julien@lengrand.fr",
     description = ("Take one picture of yourself a day, automatically generate a movie!"),
     license = "BSD License",
     keywords = "image_processing computer_vision one_picture_a_day photography",
     url = "http://jlengrand.github.com/FaceMovie/",
     download_url = "http://jlengrand.github.com/FaceMovie/",
-    packages=['facemovie', 'facemovie.lib', 'haarcascades', 'gui'],
+    packages=['facemovie', 'facemovie.lib', 'gui'],
     long_description=read('README.markdown'),
     classifiers=[
         "Development Status :: 3 - Alpha",
@@ -62,5 +68,6 @@ setup(
         "Operating System :: Microsoft",
         "Programming Language :: Python :: 2 :: Only",
     ],
-	data_files = haar_files,
+	data_files = data_files,
+    scripts=['bin/Ivolution.py']
 )