diff --git a/Ivolution.py b/Ivolution.py
index 6d1a231..23a2a2b 100755
--- a/Ivolution.py
+++ b/Ivolution.py
@@ -4,6 +4,9 @@ from gi.repository import Gtk, GObject
 from ivolution.gui import IvolutionWindow
 
 
+import os
+print "Script"
+print os.getcwd()
 my_app = IvolutionWindow.IvolutionWindow("Ivolution")
 GObject.threads_init()
 Gtk.main()
diff --git a/MANIFEST.in b/MANIFEST.in
index 1df50a9..5c48e19 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,10 @@
 recursive-include log *
-recursive-include bin *
-recursive-include docs *
+recursive-include doc/build *
 include LICENSE
 include README*
 include AUTHORS
-include CHANGES
\ No newline at end of file
+include CHANGES
+recursive-include ivolution/data/haarcascades *
+recursive-include ivolution/data/samples *
+recursive-include ivolution/data/ui *
+recursive-include ivolution/data/media *
\ No newline at end of file
diff --git a/ivolution/data/__init__.py b/ivolution/data/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ivolution/data/media/__init__.py b/ivolution/data/media/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ivolution/data/samples/__init__.py b/ivolution/data/samples/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ivolution/data/ui/__init__.py b/ivolution/data/ui/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ivolution/gui/IvolutionWindow.py b/ivolution/gui/IvolutionWindow.py
index fdf7095..5b260d7 100755
--- a/ivolution/gui/IvolutionWindow.py
+++ b/ivolution/gui/IvolutionWindow.py
@@ -28,6 +28,8 @@ class IvolutionWindow(FacemovieThread.Observer, FacemovieThread.Observable):
         self.my_logger = None
         self.console_logger = None
 
+        print "GUI"
+        print os.getcwd()
         self.builder = Gtk.Builder()
         self.builder.add_from_file("ivolution/data/ui/IvolutionWindow.glade")
         #self.builder.connect_signals({ "on_ivolutionwindow_destroy" : Gtk.main_quit })
@@ -190,10 +192,15 @@ class IvolutionWindow(FacemovieThread.Observer, FacemovieThread.Observable):
         Start logging in file here
         """
         # create logger for  'facemovie'
-        self.my_logger = logging.getLogger('FileLog')
+        #self.my_logger = logging.getLogger('FileLog')
+        self.my_logger = logging.getLogger('ConsoleLog')
+        
         self.my_logger.setLevel(logging.DEBUG)
         # create file handler which logs even debug messages
-        fh = logging.FileHandler('log/fm.log')
+        
+        fh = logging.StreamHandler()
+        #fh = logging.FileHandler('log/fm.log')
+        
         fh.setLevel(logging.DEBUG)
         # create console handler with a higher log level
         self.console_logger = logging.getLogger('ConsoleLog')
diff --git a/setup.py b/setup.py
index db7cd4b..84561ae 100644
--- a/setup.py
+++ b/setup.py
@@ -5,47 +5,12 @@ Created on 19 avr. 2012
 '''
 # creating executable here
 from distutils.core import setup
-import sys
 import os
-import glob
-
-import facemovie
-
-def find_data_files(source,target,patterns):
-    """Locates the specified data-files and returns the matches
-    in a data_files compatible format.
-
-    source is the root of the source data tree.
-        Use '' or '.' for current directory.
-    target is the root of the target data tree.
-        Use '' or '.' for the distribution directory.
-    patterns is a sequence of glob-patterns for the
-        files you want to copy.
-    """
-    if glob.has_magic(source) or glob.has_magic(target):
-        raise ValueError("Magic not allowed in src, target")
-    ret = {}l
-    for pattern in patterns:
-        pattern = os.path.join(source,pattern)
-        for filename in glob.glob(pattern):
-            if os.path.isfile(filename):
-                targetpath = os.path.join(target,os.path.relpath(filename,source))
-                path = os.path.dirname(targetpath)
-                ret.setdefault(path,[]).append(filename)
-    return sorted(ret.items())
 
 # Utility function to read the README file.
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
-#haar_files = find_data_files('facemovie','',['haarcascades/*.xml'])   
-
-setup(...,
-      packages=['mypkg'],
-      package_dir={'mypkg': 'src/mypkg'},
-      package_data={'mypkg': ['data/*.dat']},
-      )
-
 setup(
     name = "Ivolution",
     version = "1.0",
@@ -56,7 +21,7 @@ setup(
     keywords = "image_processing computer_vision one_picture_a_day photography",
     url = "http://jlengrand.github.com/FaceMovie/",
     download_url = "http://jlengrand.github.com/FaceMovie/",
-    packages=['ivolution', 'ivolution.util', 'ivolution.gui'],
+    packages=['ivolution', 'ivolution.util', 'ivolution.gui', 'ivolution.data'],
     long_description=read('README.markdown'),
     classifiers=[
         "Development Status :: 3 - Alpha",
@@ -70,6 +35,7 @@ setup(
     ],
 	#data_files = data_files,
     scripts=['Ivolution.py', 'Facemoviefier.py'],
-    package_dir={'data' : 'ivolution/data'},
-    package_data={'data' : ['haarcascades/*.xml'], 'data' : ['samples/*'], 'data' : ['ui/*'], 'data' : ['media/*']}
+    package_dir={'ivolution.data' : 'ivolution/data'},
+    #package_data={'ivolution.data' : ['haarcascades/*'], 'ivolution.data' : ['samples/*'], 'ivolution.data' : ['ui/*'], 'ivolution.media' : ['media/*']}
+    package_data={'ivolution.data' : ['haarcascades/*', 'samples/*', 'ui/*', 'media/*']}
 )