diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f26a01e948cdc392cfffaa8447e4eeb8aac6ff48
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,254 @@
+# This build file is defined in two parts: 1) a generic set of instructions you
+# probably **don't** need to change and 2) a part you may have to tune to your
+# project. It heavily uses template features from YAML to help you in only
+# changing a minimal part of it and avoid code duplication to a maximum while
+# still providing a nice pipeline display on your package.
+
+
+# 1) Generic instructions (only change if you know what you're doing)
+# -------------------------------------------------------------------
+
+# Definition of our build pipeline
+stages:
+  - build
+  - test
+  - docs
+  - wheels
+
+
+# Global variables
+variables:
+  CONDA_PREFIX: env
+
+
+# Template for the build stage
+# Needs to run on all supported architectures, platforms and python versions
+.build_template: &build_job
+  stage: build
+  before_script:
+    - git clean -ffdx
+    - curl --silent https://gitlab.idiap.ch/bob/bob/snippets/7/raw | tr -d '\r' > bootstrap-conda.sh
+    - chmod 755 ./bootstrap-conda.sh
+    - ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
+  variables: &build_variables
+    BOB_DOCUMENTATION_SERVER: "http://www.idiap.ch/software/bob/docs/latest/bob/%s/master/"
+  script:
+    - ./bin/buildout
+    - if [ -x ./bin/bob_dbmanage.py ]; then ./bin/bob_dbmanage.py all download --force; fi
+    - ./bin/sphinx-build doc sphinx
+    - ./bin/python setup.py bdist_wheel --python-tag ${WHEEL_TAG}
+  after_script:
+    - rm -rf ${CONDA_PREFIX}
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - bootstrap-conda.sh
+      - dist/
+      - sphinx/
+
+
+# Template for building on a Linux machine
+.build_linux_template: &linux_build_job
+  <<: *build_job
+  variables: &linux_build_variables
+    <<: *build_variables
+    CONDA_FOLDER: "/local/conda"
+    CFLAGS: "-D_GLIBCXX_USE_CXX11_ABI=0 -coverage"
+    CXXFLAGS: "-D_GLIBCXX_USE_CXX11_ABI=0 -coverage"
+
+
+# Template for building on a Mac OSX machine
+.build_mac_template: &macosx_build_job
+  <<: *build_job
+  variables: &macosx_build_variables
+    <<: *build_variables
+    CONDA_FOLDER: "/opt/conda"
+    MACOSX_DEPLOYMENT_TARGET: "10.9"
+    CFLAGS: "-pthread -coverage"
+    CXXFLAGS: "-pthread -coverage"
+    LDFLAGS: "-lpthread"
+
+
+# Template for the test stage - re-install from uploaded wheels
+# Needs to run on all supported architectures, platforms and python versions
+.test_template: &test_job
+  stage: test
+  before_script:
+    - ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
+    - source ${CONDA_FOLDER}/bin/activate ${CONDA_PREFIX}
+    - pip install --use-wheel --no-index --pre dist/*.whl
+  script:
+    - cd ${CONDA_PREFIX}
+    - python -c "from ${CI_PROJECT_NAME} import get_config; print(get_config())"
+    - coverage run --source=${CI_PROJECT_NAME} ./bin/nosetests -sv ${CI_PROJECT_NAME}
+    - coverage report
+    - sphinx-build -b doctest ../doc ../sphinx
+  after_script:
+    - rm -rf ${CONDA_PREFIX}
+
+
+# Template for the wheel uploading stage
+# Needs to run against one combination of python 2.x and 3.x if it is a python
+# only package, otherwise, needs to run in both pythons to all supported
+# architectures (Linux and Mac OSX 64-bit)
+.wheels_template: &wheels_job
+  stage: wheels
+  only:
+    - master
+    - tags
+  before_script:
+    - curl --silent https://gitlab.idiap.ch/bob/bob/snippets/8/raw | tr -d '\r' > upload-wheel.sh
+    - chmod 755 upload-wheel.sh
+  script:
+    - ./upload-wheel.sh
+
+
+# Template for (latest) documentation upload stage
+# Only one real job needs to do this
+.docs_template: &docs_job
+  stage: docs
+  only:
+    - master
+  before_script:
+    - curl --silent https://gitlab.idiap.ch/bob/bob/snippets/9/raw | tr -d '\r' > upload-sphinx.sh
+    - chmod 755 upload-sphinx.sh
+  script:
+    - ./upload-sphinx.sh
+
+
+# 2) Package specific instructions (you may tune this if needed)
+# --------------------------------------------------------------
+
+# Linux + Python 2.7: Builds, tests, uploads wheel
+build_linux_27:
+  <<: *linux_build_job
+  variables: &linux_27_build_variables
+    <<: *linux_build_variables
+    PYTHON_VER: "2.7"
+    WHEEL_TAG: "py27"
+  tags:
+    - conda-linux
+
+test_linux_27:
+  <<: *test_job
+  variables: *linux_27_build_variables
+  dependencies:
+    - build_linux_27
+  tags:
+    - conda-linux
+
+wheels_linux_27:
+  <<: *wheels_job
+  dependencies:
+    - build_linux_27
+  tags:
+    - conda-linux
+
+
+# Linux + Python 3.4: Builds and tests
+build_linux_34:
+  <<: *linux_build_job
+  variables: &linux_34_build_variables
+    <<: *linux_build_variables
+    PYTHON_VER: "3.4"
+    WHEEL_TAG: "py3"
+  tags:
+    - conda-linux
+
+test_linux_34:
+  <<: *test_job
+  variables: *linux_34_build_variables
+  dependencies:
+    - build_linux_34
+  tags:
+    - conda-linux
+
+
+# Linux + Python 3.5: Builds, tests, uploads wheel
+build_linux_35:
+  <<: *linux_build_job
+  variables: &linux_35_build_variables
+    <<: *linux_build_variables
+    PYTHON_VER: "3.5"
+    WHEEL_TAG: "py3"
+  tags:
+    - conda-linux
+
+test_linux_35:
+  <<: *test_job
+  variables: *linux_35_build_variables
+  dependencies:
+    - build_linux_35
+  tags:
+    - conda-linux
+
+wheels_linux_35:
+  <<: *wheels_job
+  dependencies:
+    - build_linux_35
+  tags:
+    - conda-linux
+
+docs_linux_35:
+  <<: *docs_job
+  dependencies:
+    - build_linux_35
+  tags:
+    - conda-linux
+
+
+# Mac OSX + Python 2.7: Builds and tests
+build_macosx_27:
+  <<: *macosx_build_job
+  variables: &macosx_27_build_variables
+    <<: *macosx_build_variables
+    PYTHON_VER: "2.7"
+    WHEEL_TAG: "py27"
+  tags:
+    - conda-macosx
+
+test_macosx_27:
+  <<: *test_job
+  variables: *macosx_27_build_variables
+  dependencies:
+    - build_macosx_27
+  tags:
+    - conda-macosx
+
+
+# Mac OSX + Python 3.4: Builds and tests
+build_macosx_34:
+  <<: *macosx_build_job
+  variables: &macosx_34_build_variables
+    <<: *macosx_build_variables
+    PYTHON_VER: "3.4"
+    WHEEL_TAG: "py3"
+  tags:
+    - conda-macosx
+
+test_macosx_34:
+  <<: *test_job
+  variables: *macosx_34_build_variables
+  dependencies:
+    - build_macosx_34
+  tags:
+    - conda-macosx
+
+
+# Mac OSX + Python 3.5: Builds and tests
+build_macosx_35:
+  <<: *macosx_build_job
+  variables: &macosx_35_build_variables
+    <<: *macosx_build_variables
+    PYTHON_VER: "3.5"
+    WHEEL_TAG: "py3"
+  tags:
+    - conda-macosx
+
+test_macosx_35:
+  <<: *test_job
+  variables: *macosx_35_build_variables
+  dependencies:
+    - build_macosx_35
+  tags:
+    - conda-macosx
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ae7fabef3b1350d20f0111924dbb2f13cda66746..0000000000000000000000000000000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-language: python
-matrix:
-  include:
-  - python: 2.7
-    env:
-    - secure: PJ/4CPDgaogOs8lSB4CMcL1sc3nsjrJP5slSQTTDH4MmqEFWcHP+gNFTSVWrOuLurT90zyZ6u5SiukGBKkK7ZiuAe40lkHNRG/JieZCRIfqrohyt4+yg/Zc3RL3B3X/Qxg9joDxkauuf2ozInPqCwM7HZXzExMhVRbc/IY+1h21RlQunNc+3e9Qrdf8We3JycgvcrS7HC1eH+iOVWihZMka2NIWm/6cAzUvNfsGJGnlc6Oi3GOWvsT+Ltt7/cv5w1bJTy83wfGHprfC9KZLV+e+qBmXOVinNSVDExxQzpCtnsbqBJn70kawz6UtW8c/kh5pDnDT+aVX1n36g2t+L+iSiXoscOGbxpGtQcEnw8Qdrb+ws8RuRNZu/l3EoNcBvQnYYMPeNQwEApqt4aHnHFHSma5Ms1AgK/IQR4Jdo47yJtC2hB9DleOk5cF23FQTJbdoLVsnUXn/0tMCacZxHHuOX2fCrYz99FcsCMMIIDfhrnfeomRT+CrRk2NCavZ0Orj0HXonVby1H6J0R4iKrfXAs5ehxzfYBU5ArNAdW7K0nUUPiz+DM9XvpplAjcx3zgNvfKI9u/FWPLfsGEtLcgZdPLyBMRFjp+1AnVsmvQS/l1rkigtILQPjdaxVNhKQCFCP5L8bdJGXj0WoRTBH5LEMV3Fy0n1Ai8uX9GK5HiNk=
-    - secure: foxvGEZyqYXlvty2vac1MS/Rta7bfIimQT9a7UHftcfUTodMNuomSKuIfhdGiYR0x0VDDkx+50GSky65R4WS00eXcUTxBANXbrClDvpTIWEABsGM5Rqgg2j1xXL4lY1ltxzOx1tckcM6+2fr7GRPElfIVTZu1ZJHHP/5DkBGsswfJSKdTLlN0tuoZuuzhI0KOadfClfaUd/39GuedwGyNwG3wwX69iPzTjOR4bMur/6WJOsBq+GBxksCglPU0xNO2ObQ66Jmqt+CIPtGCe+vzRFq9J5K002rDb99+CzXQqRZA1DT0XYojC3MW113VPhBnjKBbUASBmkETkIDlMy4EyObctWiZnXttXjQ+IE12Ttsatuaxc9e+bsPY/GgU7s4mLDRFsXSNf2HhZ/ohx0QN4bqEwy1dcN9jVfeKfutuiooJd9omOTkXHdyZeK1opDe5gxG5U3e9M7+mhqPomfqVJGCaNp6sRkZJcv3cXnppvMHCXcsrhGUQKsg+QpKyEhDC1DX0PSptU7c5+QmVE/25Dzm9Z5BW1zCHLXuVILeuU6W2F5O7yUJCgnx5LmIRewZOekI0567QO8eUnikYgV8N5SL6FwG4n0XmyH/8+8v/G5SoocJYFHVVhfPGnGSAdYPpOW0wyTIRDJjUuVHPCiE1BE8KippaJA/Zha/N+ZjwD0=
-    - BOB_DOCUMENTATION_SERVER=https://www.idiap.ch/software/bob/docs/latest/bioidiap/%s/master
-    - BOB_UPLOAD_WHEEL="--universal"
-  - python: 3.3
-  - python: 3.4
-  - python: 3.5
-before_install:
-- sudo add-apt-repository -y ppa:biometrics/bob
-- sudo apt-get update -qq
-- sudo apt-get install -qq --force-yes libjpeg8-dev libnetpbm10-dev libpng12-dev libtiff4-dev libgif-dev libboost-all-dev libblitz1-dev libhdf5-serial-dev libvl-dev dvipng texlive-latex-base texlive-latex-extra texlive-math-extra texlive-latex-recommended texlive-fonts-recommended libatlas-dev libatlas-base-dev liblapack-dev
-- sudo apt-get install -qq --force-yes python-opencv libcv-dev libcvaux-dev libopencv-dev
-- pip install --upgrade pip
-- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel sphinx nose numpy scipy matplotlib coverage
-- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r requirements.txt coveralls
-- pip install --find-links https://www.idiap.ch/software/bob/wheels/travis/ --use-wheel --pre -r databases.txt
-install:
-- python bootstrap-buildout.py
-- ./bin/buildout buildout:develop=. buildout:extensions=bob.buildout buildout:auto-checkout=
-script:
-- ./bin/python -c 'import pkg_resources; from bob.bio.face import get_config; print(get_config())'
-- ./bin/coverage run --source=bob.bio.face ./bin/nosetests -sv
-- ./bin/sphinx-build -b doctest doc sphinx
-- ./bin/sphinx-build -b html doc sphinx
-after_success:
-- coveralls
-- wget https://raw.githubusercontent.com/bioidiap/bob.extension/master/scripts/upload-{sphinx,wheel}.sh
-- chmod a+x upload-sphinx.sh upload-wheel.sh
-- ./upload-sphinx.sh
-- ./upload-wheel.sh
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..be8ca288405998356dbed4004aefa1bc7fc679aa
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+Written by Tiago de Freitas Pereira <tiago.pereira@idiap.ch>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/MANIFEST.in b/MANIFEST.in
index 78f7c5980ef28f2cf13f07380c3e7b6ccb45764d..abc62db6c35f4044893b81e64eac3fb1d23c7804 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-include README.rst bootstrap-buildout.py buildout.cfg COPYING version.txt requirements.txt
+include README.rst bootstrap-buildout.py buildout.cfg develop.cfg COPYING version.txt requirements.txt
 recursive-include doc *.py *.rst
 recursive-include bob/bio/face/test/data *.hdf5 *.jpg *.pos
diff --git a/README.rst b/README.rst
index 680daf1736f7b1994d4f0922a543951e8da36290..192b68d721c0a300b3482977bd832a8a875c8623 100644
--- a/README.rst
+++ b/README.rst
@@ -1,26 +1,26 @@
 .. vim: set fileencoding=utf-8 :
-.. Andre Anjos <andre.anjos@idiap.ch>
-.. Thu 30 Jan 08:46:53 2014 CET
+.. Sat Aug 20 07:33:55 CEST 2016
 
 .. image:: http://img.shields.io/badge/docs-stable-yellow.png
    :target: http://pythonhosted.org/bob.bio.face/index.html
 .. image:: http://img.shields.io/badge/docs-latest-orange.png
-   :target: https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.bio.face/master/index.html
-.. image:: http://travis-ci.org/bioidiap/bob.bio.face.svg?branch=master
-   :target: https://travis-ci.org/bioidiap/bob.bio.face?branch=master
-.. image:: https://coveralls.io/repos/bioidiap/bob.bio.face/badge.svg?branch=master
-   :target: https://coveralls.io/r/bioidiap/bob.bio.face?branch=master
-.. image:: https://img.shields.io/badge/github-master-0000c0.png
-   :target: https://github.com/bioidiap/bob.bio.face/tree/master
+   :target: https://www.idiap.ch/software/bob/docs/latest/bob/bob.bio.face/master/index.html
+.. image:: https://gitlab.idiap.ch/bob/bob.bio.face/badges/master/build.svg
+   :target: https://gitlab.idiap.ch/bob/bob.bio.face/commits/master
+.. image:: https://img.shields.io/badge/gitlab-project-0000c0.svg
+   :target: https://gitlab.idiap.ch/bob/bob.bio.face
 .. image:: http://img.shields.io/pypi/v/bob.bio.face.png
    :target: https://pypi.python.org/pypi/bob.bio.face
 .. image:: http://img.shields.io/pypi/dm/bob.bio.face.png
    :target: https://pypi.python.org/pypi/bob.bio.face
 
-=================================
+
+================================
  Run face recognition algorithms
-=================================
+================================
 
+This package is part of the signal-processing and machine learning toolbox
+Bob_.
 This package is part of the ``bob.bio`` packages, which allow to run comparable and reproducible biometric recognition experiments on publicly available databases.
 
 This package contains functionality to run face recognition experiments.
@@ -33,15 +33,25 @@ In this package, utilities that are specific for face recognition are contained,
 * Recognition algorithms based on image features
 
 
+
 Installation
 ------------
-To install this package -- alone or together with other `Packages of Bob <https://github.com/idiap/bob/wiki/Packages>`_ -- please read the `Installation Instructions <https://github.com/idiap/bob/wiki/Installation>`_.
-For Bob_ to be able to work properly, some dependent packages are required to be installed.
-Please make sure that you have read the `Dependencies <https://github.com/idiap/bob/wiki/Dependencies>`_ for your operating system.
 
-Documentation
--------------
-For further documentation on this package, please read the `Stable Version <http://pythonhosted.org/bob.bio.face/index.html>`_ or the `Latest Version <https://www.idiap.ch/software/bob/docs/latest/bioidiap/bob.bio.face/master/index.html>`_ of the documentation.
-For a list of tutorials on this or the other packages ob Bob_, or information on submitting issues, asking questions and starting discussions, please visit its website.
+Follow our `installation`_ instructions. Then, using the Python interpreter
+provided by the distribution, bootstrap and buildout this package::
+
+  $ python bootstrap-buildout.py
+  $ ./bin/buildout
+
+
+Contact
+-------
+
+For questions or reporting issues to this software package, contact our
+development `mailing list`_.
+
 
+.. Place your references here:
 .. _bob: https://www.idiap.ch/software/bob
+.. _installation: https://gitlab.idiap.ch/bob/bob/wikis/Installation
+.. _mailing list: https://groups.google.com/forum/?fromgroups#!forum/bob-devel
diff --git a/bootstrap-buildout.py b/bootstrap-buildout.py
index a629566735c1c84fbec7173f0f30015b2b432512..a4599211f741c468cd37a29861d1c7f2c3a641d1 100644
--- a/bootstrap-buildout.py
+++ b/bootstrap-buildout.py
@@ -25,7 +25,10 @@ import tempfile
 
 from optparse import OptionParser
 
-tmpeggs = tempfile.mkdtemp()
+__version__ = '2015-07-01'
+# See zc.buildout's changelog if this version is up to date.
+
+tmpeggs = tempfile.mkdtemp(prefix='bootstrap-')
 
 usage = '''\
 [DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
@@ -40,8 +43,9 @@ this script from going over the network.
 '''
 
 parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", help="use a specific zc.buildout version")
-
+parser.add_option("--version",
+                  action="store_true", default=False,
+                  help=("Return bootstrap.py version."))
 parser.add_option("-t", "--accept-buildout-test-releases",
                   dest='accept_buildout_test_releases',
                   action="store_true", default=False,
@@ -59,25 +63,33 @@ parser.add_option("-f", "--find-links",
 parser.add_option("--allow-site-packages",
                   action="store_true", default=False,
                   help=("Let bootstrap.py use existing site packages"))
+parser.add_option("--buildout-version",
+                  help="Use a specific zc.buildout version")
 parser.add_option("--setuptools-version",
-                  help="use a specific setuptools version")
-
+                  help="Use a specific setuptools version")
+parser.add_option("--setuptools-to-dir",
+                  help=("Allow for re-use of existing directory of "
+                        "setuptools versions"))
 
 options, args = parser.parse_args()
+if options.version:
+    print("bootstrap.py version %s" % __version__)
+    sys.exit(0)
+
 
 ######################################################################
 # load/install setuptools
 
 try:
-    if options.allow_site_packages:
-        import setuptools
-        import pkg_resources
     from urllib.request import urlopen
 except ImportError:
     from urllib2 import urlopen
 
 ez = {}
-exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
+if os.path.exists('ez_setup.py'):
+    exec(open('ez_setup.py').read(), ez)
+else:
+    exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
 
 if not options.allow_site_packages:
     # ez_setup imports site, which adds site packages
@@ -88,12 +100,19 @@ if not options.allow_site_packages:
     # We can't remove these reliably
     if hasattr(site, 'getsitepackages'):
         for sitepackage_path in site.getsitepackages():
-            sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
+            # Strip all site-packages directories from sys.path that
+            # are not sys.prefix; this is because on Windows
+            # sys.prefix is a site-package directory.
+            if sitepackage_path != sys.prefix:
+                sys.path[:] = [x for x in sys.path
+                               if sitepackage_path not in x]
 
 setup_args = dict(to_dir=tmpeggs, download_delay=0)
 
 if options.setuptools_version is not None:
     setup_args['version'] = options.setuptools_version
+if options.setuptools_to_dir is not None:
+    setup_args['to_dir'] = options.setuptools_to_dir
 
 ez['use_setuptools'](**setup_args)
 import setuptools
@@ -110,7 +129,12 @@ for path in sys.path:
 
 ws = pkg_resources.working_set
 
+setuptools_path = ws.find(
+    pkg_resources.Requirement.parse('setuptools')).location
+
+# Fix sys.path here as easy_install.pth added before PYTHONPATH
 cmd = [sys.executable, '-c',
+       'import sys; sys.path[0:0] = [%r]; ' % setuptools_path +
        'from setuptools.command.easy_install import main; main()',
        '-mZqNxd', tmpeggs]
 
@@ -123,11 +147,8 @@ find_links = os.environ.get(
 if find_links:
     cmd.extend(['-f', find_links])
 
-setuptools_path = ws.find(
-    pkg_resources.Requirement.parse('setuptools')).location
-
 requirement = 'zc.buildout'
-version = options.version
+version = options.buildout_version
 if version is None and not options.accept_buildout_test_releases:
     # Figure out the most recent final version of zc.buildout.
     import setuptools.package_index
@@ -167,7 +188,7 @@ if version:
 cmd.append(requirement)
 
 import subprocess
-if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
+if subprocess.call(cmd) != 0:
     raise Exception(
         "Failed to execute command:\n%s" % repr(cmd)[1:-1])
 
diff --git a/buildout.cfg b/buildout.cfg
index fbb60bf679150f0d45b18aeb166c5f6773723d92..14f8e982c773bb7eed5af57e69f087df71f0a2e1 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,100 +1,13 @@
 ; vim: set fileencoding=utf-8 :
-; Manuel Guenther <manuel.guenther@idiap.ch>
-; Thu Oct  9 16:51:06 CEST 2014
+; Sat Aug 20 07:33:55 CEST 2016
 
 [buildout]
 parts = scripts
+develop = .
 eggs = bob.bio.face
-       bob.db.arface
-       bob.db.banca
-       bob.db.caspeal
-       bob.db.frgc
-       bob.db.gbu
-       bob.db.lfw
-       bob.db.mobio
-       bob.db.multipie
-       bob.db.scface
-       bob.db.xm2vts
-       gridtk
-       
 extensions = bob.buildout
-             mr.developer
-auto-checkout = *
-develop = src/bob.extension
-          src/bob.blitz
-          src/bob.core
-          src/bob.io.base
-          src/bob.io.image
-          src/bob.learn.activation
-          src/bob.math
-          src/bob.learn.linear
-          src/bob.sp
-          src/bob.ip.base
-          src/bob.ip.color
-          src/bob.ip.draw
-          src/bob.ip.gabor
-          src/bob.learn.em
-          src/bob.measure
-          src/bob.db.base
-          src/bob.db.verification.utils
-          src/bob.db.verification.filelist
-          src/bob.db.atnt
-          src/bob.bio.base
-          src/bob.learn.boosting
-          src/bob.ip.facedetect
-          src/bob.ip.flandmark
-          src/bob.db.arface
-          src/bob.db.banca
-          src/bob.db.caspeal
-          src/bob.db.frgc
-          src/bob.db.gbu
-          src/bob.db.lfw
-          src/bob.db.mobio
-          src/bob.db.multipie
-          src/bob.db.scface
-          src/bob.db.xm2vts
-          .
-
-; options for bob.buildout
-debug = true
-verbose = true
 newest = false
-
-[sources]
-bob.extension = git https://github.com/bioidiap/bob.extension
-bob.blitz = git https://github.com/bioidiap/bob.blitz
-bob.core = git https://github.com/bioidiap/bob.core
-bob.io.base = git https://github.com/bioidiap/bob.io.base
-bob.io.image = git https://github.com/bioidiap/bob.io.image
-bob.learn.activation = git https://github.com/bioidiap/bob.learn.activation
-bob.math = git https://github.com/bioidiap/bob.math
-bob.sp = git https://github.com/bioidiap/bob.sp
-bob.ip.base = git https://github.com/bioidiap/bob.ip.base
-bob.ip.color = git https://github.com/bioidiap/bob.ip.color
-bob.ip.draw = git https://github.com/bioidiap/bob.ip.draw
-bob.ip.gabor = git https://github.com/bioidiap/bob.ip.gabor
-bob.learn.linear = git https://github.com/bioidiap/bob.learn.linear
-bob.learn.em = git https://github.com/bioidiap/bob.learn.em
-bob.measure = git https://github.com/bioidiap/bob.measure
-bob.db.base = git https://github.com/bioidiap/bob.db.base
-bob.db.verification.utils = git https://github.com/bioidiap/bob.db.verification.utils
-bob.db.verification.filelist = git https://github.com/bioidiap/bob.db.verification.filelist
-bob.db.atnt = git https://github.com/bioidiap/bob.db.atnt
-bob.bio.base = git https://github.com/bioidiap/bob.bio.base
-bob.learn.boosting = git https://github.com/bioidiap/bob.learn.boosting
-bob.ip.facedetect = git https://github.com/bioidiap/bob.ip.facedetect
-bob.ip.flandmark = git https://github.com/bioidiap/bob.ip.flandmark
-
-bob.db.arface = git https://github.com/bioidiap/bob.db.arface
-bob.db.banca = git https://github.com/bioidiap/bob.db.banca
-bob.db.caspeal = git https://github.com/bioidiap/bob.db.caspeal
-bob.db.frgc = git https://github.com/bioidiap/bob.db.frgc 
-bob.db.gbu = git https://github.com/bioidiap/bob.db.gbu
-bob.db.lfw = git https://github.com/bioidiap/bob.db.lfw 
-bob.db.mobio = git https://github.com/bioidiap/bob.db.mobio
-bob.db.multipie = git https://github.com/bioidiap/bob.db.multipie
-bob.db.scface = git https://github.com/bioidiap/bob.db.scface
-bob.db.xm2vts = git https://github.com/bioidiap/bob.db.xm2vts
+verbose = true
 
 [scripts]
 recipe = bob.buildout:scripts
diff --git a/develop.cfg b/develop.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..7f4a170aa3f72944af8417092c623b054ec8e8dd
--- /dev/null
+++ b/develop.cfg
@@ -0,0 +1,101 @@
+; vim: set fileencoding=utf-8 :
+; Manuel Guenther <manuel.guenther@idiap.ch>
+; Thu Oct  9 16:51:06 CEST 2014
+
+[buildout]
+parts = scripts
+eggs = bob.bio.face
+       bob.db.arface
+       bob.db.banca
+       bob.db.caspeal
+       bob.db.frgc
+       bob.db.gbu
+       bob.db.lfw
+       bob.db.mobio
+       bob.db.multipie
+       bob.db.scface
+       bob.db.xm2vts
+       gridtk
+       
+extensions = bob.buildout
+             mr.developer
+auto-checkout = *
+develop = src/bob.extension
+          src/bob.blitz
+          src/bob.core
+          src/bob.io.base
+          src/bob.io.image
+          src/bob.learn.activation
+          src/bob.math
+          src/bob.learn.linear
+          src/bob.sp
+          src/bob.ip.base
+          src/bob.ip.color
+          src/bob.ip.draw
+          src/bob.ip.gabor
+          src/bob.learn.em
+          src/bob.measure
+          src/bob.db.base
+          src/bob.db.verification.utils
+          src/bob.db.verification.filelist
+          src/bob.db.atnt
+          src/bob.bio.base
+          src/bob.learn.boosting
+          src/bob.ip.facedetect
+          src/bob.ip.flandmark
+          src/bob.db.arface
+          src/bob.db.banca
+          src/bob.db.caspeal
+          src/bob.db.frgc
+          src/bob.db.gbu
+          src/bob.db.lfw
+          src/bob.db.mobio
+          src/bob.db.multipie
+          src/bob.db.scface
+          src/bob.db.xm2vts
+          .
+
+; options for bob.buildout
+debug = true
+verbose = true
+newest = false
+
+[sources]
+bob.extension = git https://gitlab.idiap.ch/bob/bob.extension
+bob.blitz = git https://gitlab.idiap.ch/bob/bob.blitz
+bob.core = git https://gitlab.idiap.ch/bob/bob.core
+bob.io.base = git https://gitlab.idiap.ch/bob/bob.io.base
+bob.io.image = git https://gitlab.idiap.ch/bob/bob.io.image
+bob.learn.activation = git https://gitlab.idiap.ch/bob/bob.learn.activation
+bob.math = git https://gitlab.idiap.ch/bob/bob.math
+bob.sp = git https://gitlab.idiap.ch/bob/bob.sp
+bob.ip.base = git https://gitlab.idiap.ch/bob/bob.ip.base
+bob.ip.color = git https://gitlab.idiap.ch/bob/bob.ip.color
+bob.ip.draw = git https://gitlab.idiap.ch/bob/bob.ip.draw
+bob.ip.gabor = git https://gitlab.idiap.ch/bob/bob.ip.gabor
+bob.learn.linear = git https://gitlab.idiap.ch/bob/bob.learn.linear
+bob.learn.em = git https://gitlab.idiap.ch/bob/bob.learn.em
+bob.measure = git https://gitlab.idiap.ch/bob/bob.measure
+bob.db.base = git https://gitlab.idiap.ch/bob/bob.db.base
+bob.db.verification.utils = git https://gitlab.idiap.ch/bob/bob.db.verification.utils
+bob.db.verification.filelist = git https://gitlab.idiap.ch/bob/bob.db.verification.filelist
+bob.db.atnt = git https://gitlab.idiap.ch/bob/bob.db.atnt
+bob.bio.base = git https://gitlab.idiap.ch/bob/bob.bio.base
+bob.learn.boosting = git https://gitlab.idiap.ch/bob/bob.learn.boosting
+bob.ip.facedetect = git https://gitlab.idiap.ch/bob/bob.ip.facedetect
+bob.ip.flandmark = git https://gitlab.idiap.ch/bob/bob.ip.flandmark
+
+bob.db.arface = git https://gitlab.idiap.ch/bob/bob.db.arface
+bob.db.banca = git https://gitlab.idiap.ch/bob/bob.db.banca
+bob.db.caspeal = git https://gitlab.idiap.ch/bob/bob.db.caspeal
+bob.db.frgc = git https://gitlab.idiap.ch/bob/bob.db.frgc 
+bob.db.gbu = git https://gitlab.idiap.ch/bob/bob.db.gbu
+bob.db.lfw = git https://gitlab.idiap.ch/bob/bob.db.lfw 
+bob.db.mobio = git https://gitlab.idiap.ch/bob/bob.db.mobio
+bob.db.multipie = git https://gitlab.idiap.ch/bob/bob.db.multipie
+bob.db.scface = git https://gitlab.idiap.ch/bob/bob.db.scface
+bob.db.xm2vts = git https://gitlab.idiap.ch/bob/bob.db.xm2vts
+
+[scripts]
+recipe = bob.buildout:scripts
+dependent-scripts = true
diff --git a/doc/conf.py b/doc/conf.py
index e410c6506f7a957dd5b21c2ff22f06d64914a4fa..2728d9ad9316ea153e5164cc8b1b16b477a94cbc 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,46 +1,47 @@
 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
-# Andre Anjos <andre.anjos@idiap.ch>
-# Mon 13 Aug 2012 12:38:15 CEST
-#
-# Copyright (C) 2011-2014 Idiap Research Institute, Martigny, Switzerland
 
 import os
 import sys
 import glob
 import pkg_resources
 
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
 
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '1.3'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-  'sphinx.ext.todo',
-  'sphinx.ext.coverage',
-  'sphinx.ext.pngmath',
-  'sphinx.ext.ifconfig',
-  'sphinx.ext.autodoc',
-  'sphinx.ext.autosummary',
-  'sphinx.ext.doctest',
-  'sphinx.ext.intersphinx',
-  ]
+    'sphinx.ext.todo',
+    'sphinx.ext.coverage',
+    'sphinx.ext.ifconfig',
+    'sphinx.ext.autodoc',
+    'sphinx.ext.autosummary',
+    'sphinx.ext.doctest',
+    'sphinx.ext.graphviz',
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.napoleon',
+    'sphinx.ext.viewcode',
+    ]
 
-# The viewcode extension appeared only on Sphinx >= 1.0.0
 import sphinx
-if sphinx.__version__ >= "1.0":
-  extensions.append('sphinx.ext.viewcode')
+if sphinx.__version__ >= "1.4.1":
+    extensions.append('sphinx.ext.imgmath')
+else:
+    extensions.append('sphinx.ext.pngmath')
 
 # Always includes todos
 todo_include_todos = True
 
+# Generates auto-summary automatically
+autosummary_generate = True
+
+# Create numbers on figures with captions
+numfig = True
+
 # If we are on OSX, the 'dvipng' path maybe different
 dvipng_osx = '/opt/local/libexec/texlive/binaries/dvipng'
 if os.path.exists(dvipng_osx): pngmath_dvipng = dvipng_osx
@@ -58,12 +59,12 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'Run Face Recognition Experiments with bob.bio'
+project = u'bob.bio.face'
 import time
 copyright = u'%s, Idiap Research Institute' % time.strftime('%Y')
 
 # Grab the setup entry
-distribution = pkg_resources.require('bob.bio.face')[0]
+distribution = pkg_resources.require(project)[0]
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -86,7 +87,7 @@ release = distribution.version
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['links.rst', 'references.rst']
+exclude_patterns = ['links.rst']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -108,13 +109,18 @@ pygments_style = 'sphinx'
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
+# Some variables which are useful for generated material
+project_variable = project.replace('.', '_')
+short_description = u'Run face recognition algorithms'
+owner = [u'Idiap Research Institute']
+
 
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-if sphinx.__version__ >= "1.0":
-  html_theme = 'nature'
+import sphinx_rtd_theme
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -122,14 +128,14 @@ if sphinx.__version__ >= "1.0":
 #html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
 #html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = 'bob'
+#html_short_title = project_variable
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
@@ -187,73 +193,48 @@ html_favicon = 'img/favicon.ico'
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'bob_bio_face_doc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-latex_paper_size = 'a4'
-
-# The font size ('10pt', '11pt' or '12pt').
-latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'bob_bio_face.tex', u'Bob',
-   u'Biometrics Group, Idiap Research Institute', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-latex_logo = ''
+htmlhelp_basename = project_variable + u'_doc'
 
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
 
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
+# -- Post configuration --------------------------------------------------------
 
 # Included after all input documents
-rst_epilog = ''
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'bob.bio.face', u'Run Face Recognition Experiments with bob.bio', [u'Idiap Research Institute'], 1)
-]
+rst_epilog = """
+.. |project| replace:: Bob
+.. |version| replace:: %s
+.. |current-year| date:: %%Y
+""" % (version,)
 
 # Default processing flags for sphinx
-autoclass_content = 'both'
+autoclass_content = 'class'
 autodoc_member_order = 'bysource'
-autodoc_default_flags = ['members', 'inherited-members', 'show-inheritance']
+autodoc_default_flags = [
+  'members',
+  'undoc-members',
+  'inherited-members',
+  'show-inheritance',
+  ]
 
 # For inter-documentation mapping:
 from bob.extension.utils import link_documentation
-intersphinx_mapping = link_documentation(['python', 'numpy', 'bob.bio.gmm', 'bob.bio.video', 'bob.bio.csu', 'bob.db.lfw'])
-
-
-def skip(app, what, name, obj, skip, options):
-  # Do not skip the __call__ function as we have special implementations for them.
-  if name in ("__call__"):
-    return False
-  return skip
+intersphinx_mapping = link_documentation()
+
+# We want to remove all private (i.e. _. or __.__) members
+# that are not in the list of accepted functions
+accepted_private_functions = ['__array__']
+
+def member_function_test(app, what, name, obj, skip, options):
+  # test if we have a private function
+  if len(name) > 1 and name[0] == '_':
+    # test if this private function should be allowed
+    if name not in accepted_private_functions:
+      # omit privat functions that are not in the list of accepted private functions
+      return skip
+    else:
+      # test if the method is documented
+      if not hasattr(obj, '__doc__') or not obj.__doc__:
+        return skip
+  return False
 
 def setup(app):
-  app.connect("autodoc-skip-member", skip)
+  app.connect('autodoc-skip-member', member_function_test)
diff --git a/doc/img/logo.png b/doc/img/logo.png
index b9dd573a01019afd1af58a881996930e5212699d..b60858a7068bf45c1ed8e3da12fe244ccdcfe85d 100644
Binary files a/doc/img/logo.png and b/doc/img/logo.png differ
diff --git a/setup.py b/setup.py
index 049b9c8eff94c6807a605abc931d5c77ecefccf2..953baee29896ae608cc2fb8d74a6f1bc81957bd1 100644
--- a/setup.py
+++ b/setup.py
@@ -34,9 +34,11 @@
 # administrative interventions.
 
 from setuptools import setup, dist
+
 dist.Distribution(dict(setup_requires=['bob.extension']))
 
 from bob.extension.utils import load_requirements, find_packages
+
 install_requires = load_requirements()
 
 # The only thing we do in this file is to call the setup() function with all
@@ -45,23 +47,23 @@ setup(
 
     # This is the basic information about your project. Modify all this
     # information before releasing code publicly.
-    name = 'bob.bio.face',
-    version = open("version.txt").read().rstrip(),
-    description = 'Tools for running face recognition experiments',
+    name='bob.bio.face',
+    version=open("version.txt").read().rstrip(),
+    description='Tools for running face recognition experiments',
 
-    url = 'https://www.github.com/bioidiap/bob.bio.face',
-    license = 'GPLv3',
-    author = '<YourName>',
-    author_email = '<YourEmail>',
-    keywords = 'bob, biometric recognition, evaluation',
+    url='https://www.gitlab.idiap.ch/bob/bob.bio.face',
+    license='BSD',
+    author='Manuel Gunther',
+    author_email='siebenkopf@googlemail.com',
+    keywords='bob, biometric recognition, evaluation',
 
     # If you have a better, long description of your package, place it on the
     # 'doc' directory and then hook it here
-    long_description = open('README.rst').read(),
+    long_description=open('README.rst').read(),
 
     # This line is required for any distutils based packaging.
-    packages = find_packages(),
-    include_package_data = True,
+    packages=find_packages(),
+    include_package_data=True,
     zip_safe=False,
 
     # This line defines which packages should be installed when you "install"
@@ -69,7 +71,7 @@ setup(
     # on the current system will be installed locally and only visible to the
     # scripts of this package. Don't worry - You won't need administrative
     # privileges when using buildout.
-    install_requires = install_requires,
+    install_requires=install_requires,
 
     # Your project should be called something like 'bob.<foo>' or
     # 'bob.<foo>.<bar>'. To implement this correctly and still get all your
@@ -97,78 +99,90 @@ setup(
     #
     # In this simple example we will create a single program that will print
     # the version of bob.
-    entry_points = {
-
-      # scripts should be declared using this entry:
-      'console_scripts' : [
-        'baselines.py      = bob.bio.face.script.baselines:main',
-        'display_face_annotations.py = bob.bio.face.script.display_face_annotations:main'
-      ],
-
-      'bob.bio.database': [
-        'atnt              = bob.bio.face.config.database.atnt:database',
-        'arface            = bob.bio.face.config.database.arface:database',
-        'banca             = bob.bio.face.config.database.banca_english:database',
-        'caspeal           = bob.bio.face.config.database.caspeal:database',
-        'frgc              = bob.bio.face.config.database.frgc:database',
-        'gbu               = bob.bio.face.config.database.gbu:database',
-        'lfw-restricted    = bob.bio.face.config.database.lfw_restricted:database',
-        'lfw-unrestricted  = bob.bio.face.config.database.lfw_unrestricted:database',
-        'mobio-image       = bob.bio.face.config.database.mobio_image:database',
-        'mobio-male        = bob.bio.face.config.database.mobio_male:database', # MOBIO gender-dependent training
-        'mobio-female      = bob.bio.face.config.database.mobio_female:database', # MOBIO gender-dependent training
-        'multipie          = bob.bio.face.config.database.multipie:database',
-        'multipie-pose     = bob.bio.face.config.database.multipie_pose:database',
-        'scface            = bob.bio.face.config.database.scface:database',
-        'xm2vts            = bob.bio.face.config.database.xm2vts:database',
-      ],
-
-      'bob.bio.preprocessor': [
-        'base              = bob.bio.face.config.preprocessor.base:preprocessor', # simple color conversion
-        'face-crop-eyes    = bob.bio.face.config.preprocessor.face_crop_eyes:preprocessor', # face crop
-        'landmark-detect   = bob.bio.face.config.preprocessor.face_detect:preprocessor', # face detection + landmark detection + cropping
-        'face-detect       = bob.bio.face.config.preprocessor.face_detect:preprocessor_no_eyes', # face detection + cropping
-
-        'inorm-lbp-crop    = bob.bio.face.config.preprocessor.inorm_lbp:preprocessor', # face crop + inorm-lbp
-        'tan-triggs-crop   = bob.bio.face.config.preprocessor.tan_triggs:preprocessor', # face crop + Tan&Triggs
-        'histogram-crop    = bob.bio.face.config.preprocessor.histogram_equalization:preprocessor', # face crop + histogram equalization
-        'self-quotient-crop= bob.bio.face.config.preprocessor.self_quotient_image:preprocessor', # face crop + self quotient image
-
-        'inorm-lbp-landmark = bob.bio.face.config.preprocessor.inorm_lbp:preprocessor_landmark', # face detection + landmark detection + cropping + inorm-lbp
-        'tan-triggs-landmark = bob.bio.face.config.preprocessor.tan_triggs:preprocessor_landmark', # face detection + landmark detection + cropping + Tan&Triggs
-        'histogram-landmark = bob.bio.face.config.preprocessor.histogram_equalization:preprocessor_landmark', # face detection + landmark detection + cropping + histogram equalization
-        'self-quotient-landmark = bob.bio.face.config.preprocessor.self_quotient_image:preprocessor_landmark', # face detection + landmark detection + cropping + self quotient image
-
-        'inorm-lbp         = bob.bio.face.config.preprocessor.inorm_lbp:preprocessor_no_crop', # inorm-lbp w/o face-crop
-        'tan-triggs        = bob.bio.face.config.preprocessor.tan_triggs:preprocessor_no_crop', # Tan&Triggs w/o face-crop
-        'histogram         = bob.bio.face.config.preprocessor.histogram_equalization:preprocessor_no_crop', # histogram equalization w/o face-crop
-        'self-quotient     = bob.bio.face.config.preprocessor.self_quotient_image:preprocessor_no_crop', # self quotient image w/o face-crop
-      ],
-
-      'bob.bio.extractor': [
-        'dct-blocks        = bob.bio.face.config.extractor.dct_blocks:extractor', # DCT blocks
-        'grid-graph        = bob.bio.face.config.extractor.grid_graph:extractor', # Grid graph
-        'lgbphs            = bob.bio.face.config.extractor.lgbphs:extractor', # LGBPHS
-        'eigenface         = bob.bio.face.config.extractor.eigenface:extractor', # Eigenface
-      ],
-
-      'bob.bio.algorithm': [
-        'gabor-jet         = bob.bio.face.config.algorithm.gabor_jet:algorithm', # Gabor jet comparison
-        'histogram         = bob.bio.face.config.algorithm.histogram:algorithm', # LGBPHS histograms
-        'bic-jets          = bob.bio.face.config.algorithm.bic_jets:algorithm', # BIC on gabor jets
-      ],
-   },
+    entry_points={
+
+        # scripts should be declared using this entry:
+        'console_scripts': [
+            'baselines.py      = bob.bio.face.script.baselines:main',
+            'display_face_annotations.py = bob.bio.face.script.display_face_annotations:main'
+        ],
+
+        'bob.bio.database': [
+            'atnt              = bob.bio.face.config.database.atnt:database',
+            'arface            = bob.bio.face.config.database.arface:database',
+            'banca             = bob.bio.face.config.database.banca_english:database',
+            'caspeal           = bob.bio.face.config.database.caspeal:database',
+            'frgc              = bob.bio.face.config.database.frgc:database',
+            'gbu               = bob.bio.face.config.database.gbu:database',
+            'lfw-restricted    = bob.bio.face.config.database.lfw_restricted:database',
+            'lfw-unrestricted  = bob.bio.face.config.database.lfw_unrestricted:database',
+            'mobio-image       = bob.bio.face.config.database.mobio_image:database',
+            'mobio-male        = bob.bio.face.config.database.mobio_male:database',  # MOBIO gender-dependent training
+            'mobio-female      = bob.bio.face.config.database.mobio_female:database',  # MOBIO gender-dependent training
+            'multipie          = bob.bio.face.config.database.multipie:database',
+            'multipie-pose     = bob.bio.face.config.database.multipie_pose:database',
+            'scface            = bob.bio.face.config.database.scface:database',
+            'xm2vts            = bob.bio.face.config.database.xm2vts:database',
+        ],
+
+        'bob.bio.preprocessor': [
+            'base              = bob.bio.face.config.preprocessor.base:preprocessor',  # simple color conversion
+            'face-crop-eyes    = bob.bio.face.config.preprocessor.face_crop_eyes:preprocessor',  # face crop
+            'landmark-detect   = bob.bio.face.config.preprocessor.face_detect:preprocessor',
+            # face detection + landmark detection + cropping
+            'face-detect       = bob.bio.face.config.preprocessor.face_detect:preprocessor_no_eyes',
+            # face detection + cropping
+
+            'inorm-lbp-crop    = bob.bio.face.config.preprocessor.inorm_lbp:preprocessor',  # face crop + inorm-lbp
+            'tan-triggs-crop   = bob.bio.face.config.preprocessor.tan_triggs:preprocessor',  # face crop + Tan&Triggs
+            'histogram-crop    = bob.bio.face.config.preprocessor.histogram_equalization:preprocessor',
+            # face crop + histogram equalization
+            'self-quotient-crop= bob.bio.face.config.preprocessor.self_quotient_image:preprocessor',
+            # face crop + self quotient image
+
+            'inorm-lbp-landmark = bob.bio.face.config.preprocessor.inorm_lbp:preprocessor_landmark',
+            # face detection + landmark detection + cropping + inorm-lbp
+            'tan-triggs-landmark = bob.bio.face.config.preprocessor.tan_triggs:preprocessor_landmark',
+            # face detection + landmark detection + cropping + Tan&Triggs
+            'histogram-landmark = bob.bio.face.config.preprocessor.histogram_equalization:preprocessor_landmark',
+            # face detection + landmark detection + cropping + histogram equalization
+            'self-quotient-landmark = bob.bio.face.config.preprocessor.self_quotient_image:preprocessor_landmark',
+            # face detection + landmark detection + cropping + self quotient image
+
+            'inorm-lbp         = bob.bio.face.config.preprocessor.inorm_lbp:preprocessor_no_crop',
+            # inorm-lbp w/o face-crop
+            'tan-triggs        = bob.bio.face.config.preprocessor.tan_triggs:preprocessor_no_crop',
+            # Tan&Triggs w/o face-crop
+            'histogram         = bob.bio.face.config.preprocessor.histogram_equalization:preprocessor_no_crop',
+            # histogram equalization w/o face-crop
+            'self-quotient     = bob.bio.face.config.preprocessor.self_quotient_image:preprocessor_no_crop',
+            # self quotient image w/o face-crop
+        ],
+
+        'bob.bio.extractor': [
+            'dct-blocks        = bob.bio.face.config.extractor.dct_blocks:extractor',  # DCT blocks
+            'grid-graph        = bob.bio.face.config.extractor.grid_graph:extractor',  # Grid graph
+            'lgbphs            = bob.bio.face.config.extractor.lgbphs:extractor',  # LGBPHS
+            'eigenface         = bob.bio.face.config.extractor.eigenface:extractor',  # Eigenface
+        ],
+
+        'bob.bio.algorithm': [
+            'gabor-jet         = bob.bio.face.config.algorithm.gabor_jet:algorithm',  # Gabor jet comparison
+            'histogram         = bob.bio.face.config.algorithm.histogram:algorithm',  # LGBPHS histograms
+            'bic-jets          = bob.bio.face.config.algorithm.bic_jets:algorithm',  # BIC on gabor jets
+        ],
+    },
 
     # Classifiers are important if you plan to distribute this package through
     # PyPI. You can find the complete list of classifiers that are valid and
     # useful here (http://pypi.python.org/pypi?%3Aaction=list_classifiers).
-    classifiers = [
-      'Framework :: Bob',
-      'Development Status :: 3 - Alpha',
-      'Intended Audience :: Developers',
-      'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
-      'Natural Language :: English',
-      'Programming Language :: Python',
-      'Topic :: Scientific/Engineering :: Artificial Intelligence',
+    classifiers=[
+        'Framework :: Bob',
+        'Development Status :: 3 - Alpha',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Natural Language :: English',
+        'Programming Language :: Python',
+        'Topic :: Scientific/Engineering :: Artificial Intelligence',
     ],
 )