diff --git a/input/Axel/2012-01-12-13h54m34DSCN9766.JPG b/data/input/Axel/2012-01-12-13h54m34DSCN9766.JPG
similarity index 100%
rename from input/Axel/2012-01-12-13h54m34DSCN9766.JPG
rename to data/input/Axel/2012-01-12-13h54m34DSCN9766.JPG
diff --git a/input/Axel/2012-01-15-06h13m41DSCN9849.JPG b/data/input/Axel/2012-01-15-06h13m41DSCN9849.JPG
similarity index 100%
rename from input/Axel/2012-01-15-06h13m41DSCN9849.JPG
rename to data/input/Axel/2012-01-15-06h13m41DSCN9849.JPG
diff --git a/input/Axel/2012-02-01-07h21m31DSCN0179.JPG b/data/input/Axel/2012-02-01-07h21m31DSCN0179.JPG
similarity index 100%
rename from input/Axel/2012-02-01-07h21m31DSCN0179.JPG
rename to data/input/Axel/2012-02-01-07h21m31DSCN0179.JPG
diff --git a/input/Axel/2012-02-06-10h22m13DSCN0384.JPG b/data/input/Axel/2012-02-06-10h22m13DSCN0384.JPG
similarity index 100%
rename from input/Axel/2012-02-06-10h22m13DSCN0384.JPG
rename to data/input/Axel/2012-02-06-10h22m13DSCN0384.JPG
diff --git a/input/Axel/2012-02-10-10h22m13DSCN0384.jpg b/data/input/Axel/2012-02-10-10h22m13DSCN0384.jpg
similarity index 100%
rename from input/Axel/2012-02-10-10h22m13DSCN0384.jpg
rename to data/input/Axel/2012-02-10-10h22m13DSCN0384.jpg
diff --git a/input/Axel/2012-03-07-10h07m40DSCN1660.JPG b/data/input/Axel/2012-03-07-10h07m40DSCN1660.JPG
similarity index 100%
rename from input/Axel/2012-03-07-10h07m40DSCN1660.JPG
rename to data/input/Axel/2012-03-07-10h07m40DSCN1660.JPG
diff --git a/input/Axel/2012-03-08-12h09m30DSCN1671.JPG b/data/input/Axel/2012-03-08-12h09m30DSCN1671.JPG
similarity index 100%
rename from input/Axel/2012-03-08-12h09m30DSCN1671.JPG
rename to data/input/Axel/2012-03-08-12h09m30DSCN1671.JPG
diff --git a/input/Axel/2012-03-08-12h10m37DSCN1672.JPG b/data/input/Axel/2012-03-08-12h10m37DSCN1672.JPG
similarity index 100%
rename from input/Axel/2012-03-08-12h10m37DSCN1672.JPG
rename to data/input/Axel/2012-03-08-12h10m37DSCN1672.JPG
diff --git a/input/MichaelShanks.jpg b/data/input/MichaelShanks.jpg
similarity index 100%
rename from input/MichaelShanks.jpg
rename to data/input/MichaelShanks.jpg
diff --git a/input/search.jpg b/data/input/search.jpg
similarity index 100%
rename from input/search.jpg
rename to data/input/search.jpg
diff --git a/doc/TOBEDONE b/doc/TOBEDONE
new file mode 100644
index 0000000..e69de29
diff --git a/Eye.py b/facemovie/Eye.py
similarity index 100%
rename from Eye.py
rename to facemovie/Eye.py
diff --git a/Face.py b/facemovie/Face.py
similarity index 100%
rename from Face.py
rename to facemovie/Face.py
diff --git a/FaceParams.py b/facemovie/FaceParams.py
similarity index 100%
rename from FaceParams.py
rename to facemovie/FaceParams.py
diff --git a/Guy.py b/facemovie/Guy.py
similarity index 100%
rename from Guy.py
rename to facemovie/Guy.py
diff --git a/facemovie.py b/facemovie/facemovie.py
similarity index 100%
rename from facemovie.py
rename to facemovie/facemovie.py
diff --git a/haarcascades/haarcascade_eye.xml b/facemovie/haarcascades/haarcascade_eye.xml
similarity index 100%
rename from haarcascades/haarcascade_eye.xml
rename to facemovie/haarcascades/haarcascade_eye.xml
diff --git a/haarcascades/haarcascade_eye_tree_eyeglasses.xml b/facemovie/haarcascades/haarcascade_eye_tree_eyeglasses.xml
similarity index 100%
rename from haarcascades/haarcascade_eye_tree_eyeglasses.xml
rename to facemovie/haarcascades/haarcascade_eye_tree_eyeglasses.xml
diff --git a/haarcascades/haarcascade_frontalface_alt.xml b/facemovie/haarcascades/haarcascade_frontalface_alt.xml
similarity index 100%
rename from haarcascades/haarcascade_frontalface_alt.xml
rename to facemovie/haarcascades/haarcascade_frontalface_alt.xml
diff --git a/haarcascades/haarcascade_frontalface_alt2.xml b/facemovie/haarcascades/haarcascade_frontalface_alt2.xml
similarity index 100%
rename from haarcascades/haarcascade_frontalface_alt2.xml
rename to facemovie/haarcascades/haarcascade_frontalface_alt2.xml
diff --git a/haarcascades/haarcascade_frontalface_alt_tree.xml b/facemovie/haarcascades/haarcascade_frontalface_alt_tree.xml
similarity index 100%
rename from haarcascades/haarcascade_frontalface_alt_tree.xml
rename to facemovie/haarcascades/haarcascade_frontalface_alt_tree.xml
diff --git a/haarcascades/haarcascade_frontalface_default.xml b/facemovie/haarcascades/haarcascade_frontalface_default.xml
similarity index 100%
rename from haarcascades/haarcascade_frontalface_default.xml
rename to facemovie/haarcascades/haarcascade_frontalface_default.xml
diff --git a/haarcascades/haarcascade_fullbody.xml b/facemovie/haarcascades/haarcascade_fullbody.xml
similarity index 100%
rename from haarcascades/haarcascade_fullbody.xml
rename to facemovie/haarcascades/haarcascade_fullbody.xml
diff --git a/haarcascades/haarcascade_lefteye_2splits.xml b/facemovie/haarcascades/haarcascade_lefteye_2splits.xml
similarity index 100%
rename from haarcascades/haarcascade_lefteye_2splits.xml
rename to facemovie/haarcascades/haarcascade_lefteye_2splits.xml
diff --git a/haarcascades/haarcascade_lowerbody.xml b/facemovie/haarcascades/haarcascade_lowerbody.xml
similarity index 100%
rename from haarcascades/haarcascade_lowerbody.xml
rename to facemovie/haarcascades/haarcascade_lowerbody.xml
diff --git a/haarcascades/haarcascade_mcs_eyepair_big.xml b/facemovie/haarcascades/haarcascade_mcs_eyepair_big.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_eyepair_big.xml
rename to facemovie/haarcascades/haarcascade_mcs_eyepair_big.xml
diff --git a/haarcascades/haarcascade_mcs_eyepair_small.xml b/facemovie/haarcascades/haarcascade_mcs_eyepair_small.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_eyepair_small.xml
rename to facemovie/haarcascades/haarcascade_mcs_eyepair_small.xml
diff --git a/haarcascades/haarcascade_mcs_leftear.xml b/facemovie/haarcascades/haarcascade_mcs_leftear.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_leftear.xml
rename to facemovie/haarcascades/haarcascade_mcs_leftear.xml
diff --git a/haarcascades/haarcascade_mcs_lefteye.xml b/facemovie/haarcascades/haarcascade_mcs_lefteye.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_lefteye.xml
rename to facemovie/haarcascades/haarcascade_mcs_lefteye.xml
diff --git a/haarcascades/haarcascade_mcs_mouth.xml b/facemovie/haarcascades/haarcascade_mcs_mouth.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_mouth.xml
rename to facemovie/haarcascades/haarcascade_mcs_mouth.xml
diff --git a/haarcascades/haarcascade_mcs_nose.xml b/facemovie/haarcascades/haarcascade_mcs_nose.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_nose.xml
rename to facemovie/haarcascades/haarcascade_mcs_nose.xml
diff --git a/haarcascades/haarcascade_mcs_rightear.xml b/facemovie/haarcascades/haarcascade_mcs_rightear.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_rightear.xml
rename to facemovie/haarcascades/haarcascade_mcs_rightear.xml
diff --git a/haarcascades/haarcascade_mcs_righteye.xml b/facemovie/haarcascades/haarcascade_mcs_righteye.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_righteye.xml
rename to facemovie/haarcascades/haarcascade_mcs_righteye.xml
diff --git a/haarcascades/haarcascade_mcs_upperbody.xml b/facemovie/haarcascades/haarcascade_mcs_upperbody.xml
similarity index 100%
rename from haarcascades/haarcascade_mcs_upperbody.xml
rename to facemovie/haarcascades/haarcascade_mcs_upperbody.xml
diff --git a/haarcascades/haarcascade_profileface.xml b/facemovie/haarcascades/haarcascade_profileface.xml
similarity index 100%
rename from haarcascades/haarcascade_profileface.xml
rename to facemovie/haarcascades/haarcascade_profileface.xml
diff --git a/haarcascades/haarcascade_righteye_2splits.xml b/facemovie/haarcascades/haarcascade_righteye_2splits.xml
similarity index 100%
rename from haarcascades/haarcascade_righteye_2splits.xml
rename to facemovie/haarcascades/haarcascade_righteye_2splits.xml
diff --git a/haarcascades/haarcascade_upperbody.xml b/facemovie/haarcascades/haarcascade_upperbody.xml
similarity index 100%
rename from haarcascades/haarcascade_upperbody.xml
rename to facemovie/haarcascades/haarcascade_upperbody.xml
diff --git a/main_file.py b/facemovie/main_file.py
similarity index 100%
rename from main_file.py
rename to facemovie/main_file.py
diff --git a/face_script.py b/test/face_script.py
similarity index 100%
rename from face_script.py
rename to test/face_script.py
diff --git a/test_script.py b/test/test_script.py
similarity index 100%
rename from test_script.py
rename to test/test_script.py