diff --git a/sigal/__init__.py b/sigal/__init__.py
index d6bc02a..a3760bf 100644
--- a/sigal/__init__.py
+++ b/sigal/__init__.py
@@ -105,8 +105,8 @@ def build(source, destination, debug=False, verbose=False, force=False,
         sys.exit(1)
 
     locale.setlocale(locale.LC_ALL, settings['locale'])
-    gal = Gallery(settings, force=force, theme=theme, ncpu=ncpu)
-    gal.build()
+    gal = Gallery(settings, theme=theme, ncpu=ncpu)
+    gal.build(force=force)
 
     # copy extra files
     for src, dst in settings['files_to_copy']:
diff --git a/sigal/compat.py b/sigal/compat.py
index 634b059..0bed15d 100644
--- a/sigal/compat.py
+++ b/sigal/compat.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import locale
 import sys
 
 PY2 = sys.version_info[0] == 2
@@ -9,12 +10,23 @@ if not PY2:
     string_types = (str,)
     unichr = chr
 
+    from functools import cmp_to_key
+    alpha_sort = {'key': cmp_to_key(locale.strcoll)}
+
     from http import server
     import socketserver
 else:
     text_type = unicode  # NOQA
     string_types = (str, unicode)  # NOQA
     unichr = unichr
+    alpha_sort = {'cmp': locale.strcoll}
 
     import SimpleHTTPServer as server
     import SocketServer as socketserver
+
+
+class UnicodeMixin(object):
+    if not PY2:
+        __str__ = lambda x: x.__unicode__()
+    else:
+        __str__ = lambda x: unicode(x).encode('utf-8')
diff --git a/sigal/gallery.py b/sigal/gallery.py
index 6d50b2c..a175767 100644
--- a/sigal/gallery.py
+++ b/sigal/gallery.py
@@ -24,7 +24,7 @@
 from __future__ import absolute_import, print_function
 
 import codecs
-import locale
+import itertools
 import logging
 import markdown
 import multiprocessing
@@ -32,163 +32,277 @@ import os
 import sys
 import zipfile
 
-from os.path import join, normpath
+from os.path import isfile, join
 from PIL import Image as PILImage
-from pprint import pformat
 
-from . import compat
-from .image import process_image
+from . import image, video
+from .compat import UnicodeMixin, alpha_sort
+from .image import process_image, get_exif_tags
 from .log import colored, BLUE
+from .settings import get_thumb, get_orig
 from .utils import copy, check_or_create_dir
 from .video import process_video
 from .writer import Writer
 
-DESCRIPTION_FILE = "index.md"
 
+class Media(UnicodeMixin):
 
-class FileExtensionError(Exception):
-    """Raised if we made an error when handling file extensions"""
-    pass
+    def __init__(self, filename, path, settings):
+        self.filename = filename
+        self.settings = settings
+        self.file_path = join(path, filename)
+        self.src_path = join(settings['source'], path, filename)
+        self.dst_path = join(settings['destination'], path, filename)
 
+        self.thumb_name = get_thumb(self.settings, self.filename)
+        self.thumb_path = join(settings['destination'], path, self.thumb_name)
 
-class PathsDb(object):
-    """Container for all the information on the directory structure.
-
-    All the info is stored in a dictionnary, `self.db`. This class also has
-    methods to build this dictionnary.
-
-    """
-
-    def __init__(self, path, img_ext_list, vid_ext_list):
-        self.img_ext_list = img_ext_list
-        self.vid_ext_list = vid_ext_list
-        self.ext_list = self.img_ext_list + self.vid_ext_list
         self.logger = logging.getLogger(__name__)
+        self.raw_exif = None
+        self.exif = None
 
-        # The dict containing all information
-        self.db = {
-            'paths_list': [],
-            'skipped_dir': []
-        }
+    def __repr__(self):
+        return "<%s>(%r)" % (self.__class__.__name__, self.file_path)
 
-        # basepath must to be a unicode string so that os.walk will return
-        # unicode dirnames and filenames. If basepath is a str, we must
-        # convert it to unicode.
-        if compat.PY2 and isinstance(path, str):
-            enc = locale.getpreferredencoding()
-            self.basepath = path.decode(enc)
+    def __unicode__(self):
+        return self.file_path
+
+    @property
+    def big(self):
+        if self.settings['keep_orig']:
+            return get_orig(self.settings, self.file_path)
         else:
-            self.basepath = path
+            return None
 
-        self.build()
+    @property
+    def thumbnail(self):
+        # if thumbnail is missing (if settings['make_thumbs'] is False)
+        if not os.path.isfile(self.thumb_path):
+            if self.type == 'image':
+                generator = image.generate_thumbnail
+            elif self.type == 'video':
+                generator = video.generate_thumbnail
 
-    def get_subdirs(self, path):
-        """Return the list of all sub-directories of path."""
+            self.logger.debug('Generating thumbnail for %r', self)
+            generator(self.src_path, self.thumb_path,
+                      self.settings['thumb_size'],
+                      fit=self.settings['thumb_fit'])
+        return self.thumb_name
 
-        for name in self.db[path].get('subdir', []):
-            subdir = normpath(join(path, name))
-            yield subdir
-            for subname in self.get_subdirs(subdir):
-                yield subname
 
-    def build(self):
-        "Build the list of directories with images"
+class Image(Media):
 
-        if compat.PY2:
-            sort_args = {'cmp': locale.strcoll}
+    type = 'image'
+    extensions = ('.jpg', '.jpeg', '.JPG', '.JPEG', '.png')
+
+    def __init__(self, filename, path, settings):
+        super(Image, self).__init__(filename, path, settings)
+        self.raw_exif, self.exif = get_exif_tags(self.src_path)
+
+
+class Video(Media):
+
+    type = 'video'
+    extensions = ('.MOV', '.mov', '.avi', '.mp4', '.webm', '.ogv')
+
+    def __init__(self, filename, path, settings):
+        super(Video, self).__init__(filename, path, settings)
+        base = os.path.splitext(filename)[0]
+        self.file_path = join(path, base + '.webm')
+        self.dst_path = join(settings['destination'], path, base + '.webm')
+
+
+class Album(UnicodeMixin):
+
+    description_file = "index.md"
+    output_file = 'index.html'
+
+    def __init__(self, path, settings, dirnames, filenames, gallery):
+        self.path = path
+        self.gallery = gallery
+        self.settings = settings
+        self.orig_path = None
+        self._thumbnail = None
+
+        if path == '.':
+            self.src_path = settings['source']
+            self.dst_path = settings['destination']
         else:
-            from functools import cmp_to_key
-            sort_args = {'key': cmp_to_key(locale.strcoll)}
+            self.src_path = join(settings['source'], path)
+            self.dst_path = join(settings['destination'], path)
 
-        # get information for each directory
-        for path, dirnames, filenames in os.walk(self.basepath,
-                                                 followlinks=True):
-            relpath = os.path.relpath(path, self.basepath)
+        self.logger = logging.getLogger(__name__)
+        self.get_metadata()
 
-            # sort images and sub-albums by name
-            filenames.sort(**sort_args)
-            dirnames.sort(**sort_args)
+        # Create thumbnails directory and optionally the one for original img
+        check_or_create_dir(self.dst_path)
+        check_or_create_dir(join(self.dst_path, settings['thumb_dir']))
 
-            self.db['paths_list'].append(relpath)
-            self.db[relpath] = {
-                'medias': [f for f in filenames
-                           if os.path.splitext(f)[1] in self.ext_list],
-                'subdir': dirnames
-            }
-            self.db[relpath].update(get_metadata(path))
+        if settings['keep_orig']:
+            self.orig_path = join(self.dst_path, settings['orig_dir'])
+            check_or_create_dir(self.orig_path)
 
-        path_media = (path for path in self.db['paths_list']
-                      if self.db[path]['medias'] and path != '.')
-        path_nomedia = (path for path in self.db['paths_list']
-                        if not self.db[path]['medias'] and path != '.')
+        # optionally add index.html to the URLs
+        self.url_ext = self.output_file if settings['index_in_url'] else ''
+        self.url = self.path + '/' + self.url_ext
+        self.index_url = os.path.relpath(settings['destination'],
+                                         self.dst_path) + '/' + self.url_ext
 
-        # dir with images: check the thumbnail, and find it if necessary
-        for path in path_media:
-            self.check_thumbnail(path)
+        # sort images and sub-albums by name
+        filenames.sort(**alpha_sort)
+        dirnames.sort(**alpha_sort)
 
-        # dir without images, start with the deepest ones
-        for path in reversed(sorted(path_nomedia, key=lambda x: x.count('/'))):
-            # stop if it is already set and a valid file
-            alb_thumb = self.db[path].setdefault('thumbnail', '')
-            if alb_thumb and os.path.isfile(join(self.basepath, path,
-                                                 alb_thumb)):
-                self.logger.debug("Thumb for %s : %s", path, alb_thumb)
-                continue
+        self.subdirs = dirnames
+        self.images = [Image(f, self.path, settings) for f in filenames
+                       if os.path.splitext(f)[1] in Image.extensions]
+        self.videos = [Video(f, self.path, settings) for f in filenames
+                       if os.path.splitext(f)[1] in Video.extensions]
 
-            for subdir in self.get_subdirs(path):
-                # use the thumbnail of their sub-directories
-                if self.db[subdir].get('thumbnail', ''):
-                    self.db[path]['thumbnail'] = join(
-                        os.path.relpath(subdir, path),
-                        self.db[subdir]['thumbnail'])
-                    self.logger.debug("Found thumb for %s : %s", path,
-                                      self.db[path]['thumbnail'])
-                    break
+    def __repr__(self):
+        return "<%s>(%r)" % (self.__class__.__name__, self.path)
 
-            if not self.db[path].get('thumbnail', ''):
-                # else remove all info about this directory
-                self.logger.info("Directory '%s' is empty", path)
-                self.db['skipped_dir'].append(path)
-                self.db['paths_list'].remove(path)
-                del self.db[path]
-                parent = normpath(join(path, '..'))
-                child = os.path.relpath(path, parent)
-                self.db[parent]['subdir'].remove(child)
+    def __unicode__(self):
+        return u"{} : {} images, {} videos".format(self.path, len(self.images),
+                                                   len(self.videos))
 
-        self.logger.debug('Database:\n%s', pformat(self.db, width=120))
+    def __len__(self):
+        return len(self.images) + len(self.videos)
 
-    def check_thumbnail(self, path):
-        "Find the thumbnail image for a given path."
+    def __iter__(self):
+        return itertools.chain(self.images, self.videos)
+
+    def get_metadata(self):
+        """ Get album metadata from `description_file` (`index.md`):
+
+        -> title, thumbnail image, description
+
+        """
+        descfile = join(self.src_path, self.description_file)
+
+        if isfile(descfile):
+            with codecs.open(descfile, "r", "utf-8") as f:
+                text = f.read()
+
+            md = markdown.Markdown(extensions=['meta'])
+            html = md.convert(text)
+
+            self.title = md.Meta.get('title', [''])[0]
+            self.description = html
+            self._thumbnail = md.Meta.get('thumbnail', [''])[0]
+            self.meta = md.Meta.copy()
+        else:
+            # default: get title from directory name
+            self.title = os.path.basename(self.path).replace('_', ' ')\
+                .replace('-', ' ').capitalize()
+            self.description = ''
+            self._thumbnail = ''
+            self.meta = {}
+
+    @property
+    def medias(self):
+        return self.images + self.videos
+
+    @property
+    def albums(self):
+        return [self.gallery.albums[path] for path in self.subdirs]
+
+    @property
+    def thumbnail(self):
+        """Check the thumbnail image for a given path, find one if possible."""
 
         # stop if it is already set and a valid file
-        alb_thumb = self.db[path].setdefault('thumbnail', '')
-        if alb_thumb and os.path.isfile(join(self.basepath, path, alb_thumb)):
-            return
+        if self._thumbnail and isfile(join(self.src_path, self._thumbnail)):
+            self.logger.debug("Thumbnail for %s : %s", self.src_path,
+                              self._thumbnail)
+            return self._thumbnail
+        else:
+            # find and return the first landscape image
+            for f in self.medias:
+                ext = os.path.splitext(f.filename)[1]
+                if ext in Image.extensions:
+                    im = PILImage.open(f.src_path)
+                    if im.size[0] > im.size[1]:
+                        self._thumbnail = join(self.path, f.thumbnail)
+                        return self._thumbnail
 
-        # find and return the first landscape image
-        for f in self.db[path]['medias']:
-            base, ext = os.path.splitext(f)
-            if ext in self.img_ext_list:
-                im = PILImage.open(join(self.basepath, path, f))
-                if im.size[0] > im.size[1]:
-                    self.db[path]['thumbnail'] = f
-                    return
+            # else simply return the 1st media file
+            if not self._thumbnail and self.medias:
+                self._thumbnail = join(self.path, self.medias[0].thumbnail)
+                return self._thumbnail
 
-        # else simply return the 1st media file
-        if self.db[path]['medias']:
-            self.db[path]['thumbnail'] = self.db[path]['medias'][0]
+            # use the thumbnail of their sub-directories
+            if not self._thumbnail:
+                for path, album in self.gallery.get_albums(self.path):
+                    if album.thumbnail:
+                        self._thumbnail = join(
+                            os.path.relpath(path, self.path), album.thumbnail)
+                        self.logger.debug("Found thumbnail for %s : %s",
+                                          self.src_path, self._thumbnail)
+                        return self._thumbnail
+
+        self.logger.error('Thumbnail not found for %r', self)
+        return None
+
+    @property
+    def breadcrumb(self):
+        """Paths to upper directories (with titles and links)."""
+
+        if self.path == '.':
+            return []
+
+        path = self.path
+        breadcrumb = [((self.url_ext or '.'), self.title)]
+
+        while True:
+            path = os.path.normpath(os.path.join(path, '..'))
+            if path == '.':
+                break
+
+            url = os.path.relpath(path, self.path) + '/' + self.url_ext
+            breadcrumb.append((url, self.gallery[path].title))
+
+        breadcrumb.reverse()
+        return breadcrumb
+
+    @property
+    def zip(self):
+        zip_gallery = self.settings['zip_gallery']
+        if zip_gallery:
+            archive_path = join(self.dst_path, zip_gallery)
+            archive = zipfile.ZipFile(archive_path, 'w')
+
+            for p in self:
+                archive.write(p.dst_path, os.path.split(p.dst_path)[1])
+
+            archive.close()
+            self.logger.debug('Created ZIP archive %s', archive_path)
+            return zip_gallery
+        else:
+            return None
 
 
 class Gallery(object):
 
-    def __init__(self, settings, force=False, theme=None, ncpu=None):
+    def __init__(self, settings, theme=None, ncpu=None):
         self.settings = settings
-        self.force = force
         self.theme = theme
         self.logger = logging.getLogger(__name__)
         self.stats = {'image': 0, 'image_skipped': 0,
                       'video': 0, 'video_skipped': 0}
+        self.init_pool(ncpu)
+        check_or_create_dir(settings['destination'])
 
+        # Build the list of directories with images
+        albums = self.albums = {}
+        src_path = self.settings['source']
+
+        for path, dirs, files in os.walk(src_path, followlinks=True):
+            relpath = os.path.relpath(path, src_path)
+            albums[relpath] = Album(relpath, self.settings, dirs, files, self)
+
+        self.logger.debug('Albums:\n%r', albums.values())
+
+    def init_pool(self, ncpu):
         try:
             cpu_count = multiprocessing.cpu_count()
         except NotImplementedError:
@@ -203,33 +317,41 @@ class Gallery(object):
                 self.logger.error('ncpu should be an integer value')
                 ncpu = cpu_count
 
+        self.logger.info("Using %s cores", ncpu)
         if ncpu > 1:
             self.pool = multiprocessing.Pool(processes=ncpu)
         else:
             self.pool = None
 
-        self.logger.info("Using %s cores", ncpu)
+    def get_albums(self, path):
+        """Return the list of all sub-directories of path."""
 
-        paths = PathsDb(self.settings['source'], self.settings['img_ext_list'],
-                        self.settings['vid_ext_list'])
-        self.db = paths.db
+        for name in self.albums[path].subdirs:
+            subdir = os.path.normpath(join(path, name))
+            yield subdir, self.albums[subdir]
+            for subname, album in self.get_albums(subdir):
+                yield subname, self.albums[subdir]
 
-    def build(self):
+    def build(self, force=False):
         "Create the image gallery"
 
-        check_or_create_dir(self.settings['destination'])
-
         # loop on directories in reversed order, to process subdirectories
         # before their parent
-
         if self.pool:
             media_list = []
+            processor = media_list.append
+        else:
+            processor = process_file
 
-            for path in reversed(self.db['paths_list']):
-                if len(self.db[path]['medias']) != 0:
-                    for files in self.process_dir(path):
-                        media_list.append(files)
+        try:
+            for album in self.albums.values():
+                if len(album) > 0:
+                    for files in self.process_dir(album, force=force):
+                        processor(files)
+        except KeyboardInterrupt:
+            sys.exit('Interrupted')
 
+        if self.pool:
             try:
                 # map_async is needed to handle KeyboardInterrupt correctly
                 self.pool.map_async(worker, media_list).get(9999)
@@ -240,86 +362,48 @@ class Gallery(object):
                 sys.exit('Interrupted')
 
             print('')
-        else:
-            try:
-                for path in reversed(self.db['paths_list']):
-                    if len(self.db[path]['medias']) != 0:
-                        for files in self.process_dir(path):
-                            process_file(files)
-                        print('')
-            except KeyboardInterrupt:
-                sys.exit('Interrupted')
 
         if self.settings['write_html']:
-            self.writer = Writer(self.settings, self.settings['destination'],
-                                 theme=self.theme)
+            self.writer = Writer(self.settings, theme=self.theme,
+                                 index_title=self.albums['.'].title)
 
-            for path in reversed(self.db['paths_list']):
-                self.writer.write(self.db, path)
+            for path, album in self.albums.items():
+                self.writer.write(self.albums, path, album)
 
-    def process_dir(self, path):
+    def process_dir(self, album, force=False):
         """Process a list of images in a directory."""
 
-        media_files = [normpath(join(self.settings['source'], path, f))
-                       for f in self.db[path]['medias']]
-
-        # output dir for the current path
-        outpath = normpath(join(self.settings['destination'], path))
-        check_or_create_dir(outpath)
-
-        # Create thumbnails directory and optionally the one for original img
-        check_or_create_dir(join(outpath, self.settings['thumb_dir']))
-
-        if self.settings['keep_orig']:
-            check_or_create_dir(join(outpath, self.settings['orig_dir']))
-
         if sys.stdout.isatty():
-            print(colored('->', BLUE),
-                  u"{} : {} files".format(path, len(media_files)))
+            print(colored('\n->', BLUE), str(album))
         else:
-            self.logger.warn("%s : %d files", path, len(media_files))
+            self.logger.warn(album)
 
-        # loop on images
-        if self.settings['zip_gallery']:
-            zip_files(join(outpath, self.settings['zip_gallery']), media_files)
-
-        for f in media_files:
-            filename = os.path.split(f)[1]
-            base, ext = os.path.splitext(filename)
-
-            if ext in self.settings['img_ext_list']:
-                outname = join(outpath, filename)
-                filetype = 'image'
-            elif ext in self.settings['vid_ext_list']:
-                outname = join(outpath, base + '.webm')
-                filetype = 'video'
-            else:
-                raise FileExtensionError
-
-            if os.path.isfile(outname) and not self.force:
-                self.logger.info("%s exists - skipping", filename)
-                self.stats[filetype + '_skipped'] += 1
+        for f in album:
+            if isfile(f.dst_path) and not force:
+                self.logger.info("%s exists - skipping", f.filename)
+                self.stats[f.type + '_skipped'] += 1
             else:
                 if self.settings['keep_orig']:
-                    copy(f, join(outpath, self.settings['orig_dir'], filename),
+                    copy(f.src_path, join(album.orig_path, f.filename),
                          symlink=self.settings['orig_link'])
 
-                self.stats[filetype] += 1
-                yield filetype, f, outpath, self.settings
+                self.stats[f.type] += 1
+                yield f.type, f.src_path, album.dst_path, self.settings
 
 
 def process_file(args):
+    ftype, src_path, dst_path, settings = args
     logger = logging.getLogger(__name__)
-    logger.info('Processing %s', args[1])
+    logger.info('Processing %s', src_path)
 
     if logger.getEffectiveLevel() > 20:
         print('.', end='')
         sys.stdout.flush()
 
-    if args[0] == 'image':
-        return process_image(*args[1:])
-    elif args[0] == 'video':
-        return process_video(*args[1:])
+    if ftype == 'image':
+        return process_image(src_path, dst_path, settings)
+    elif ftype == 'video':
+        return process_video(src_path, dst_path, settings)
 
 
 def worker(args):
@@ -327,49 +411,3 @@ def worker(args):
         process_file(args)
     except KeyboardInterrupt:
         return 'KeyboardException'
-
-
-def get_metadata(path):
-    """ Get album metadata from DESCRIPTION_FILE:
-
-    - title
-    - thumbnail image
-    - description
-
-    """
-    descfile = join(path, DESCRIPTION_FILE)
-
-    if not os.path.isfile(descfile):
-        # default: get title from directory name
-        meta = {
-            'title': os.path.basename(path).replace('_', ' ')
-            .replace('-', ' ').capitalize(),
-            'description': '',
-            'thumbnail': '',
-            'meta': {}
-        }
-    else:
-        with codecs.open(descfile, "r", "utf-8") as f:
-            text = f.read()
-
-        md = markdown.Markdown(extensions=['meta'])
-        html = md.convert(text)
-
-        meta = {
-            'title': md.Meta.get('title', [''])[0],
-            'description': html,
-            'thumbnail': md.Meta.get('thumbnail', [''])[0],
-            'meta': md.Meta.copy()
-        }
-
-    return meta
-
-
-def zip_files(archive_path, filepaths):
-    archive = zipfile.ZipFile(archive_path, 'w')
-
-    for p in filepaths:
-        filename = os.path.split(p)[1]
-        archive.write(p, filename)
-
-    archive.close()
diff --git a/sigal/settings.py b/sigal/settings.py
index 2585b4c..d913bdc 100644
--- a/sigal/settings.py
+++ b/sigal/settings.py
@@ -21,10 +21,13 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+import locale
 import logging
 import os
 from pprint import pformat
 
+from .compat import PY2
+
 _DEFAULT_CONFIG = {
     'adjust_options': {'color': 1.0, 'brightness': 1.0,
                        'contrast': 1.0, 'sharpness': 1.0},
@@ -122,6 +125,12 @@ def read_settings(filename=None):
                     settings_path, path)))
                 logger.debug("Rewrite %s : %s -> %s", p, path, settings[p])
 
+            # paths must to be unicode strings so that os.walk will return
+            # unicode dirnames and filenames
+            if PY2 and isinstance(settings[p], str):
+                enc = locale.getpreferredencoding()
+                settings[p] = settings[p].decode(enc)
+
     for key in ('img_size', 'thumb_size', 'video_size'):
         w, h = settings[key]
         if h > w:
diff --git a/sigal/themes/colorbox/templates/index.html b/sigal/themes/colorbox/templates/index.html
index 04791e9..85ccb84 100644
--- a/sigal/themes/colorbox/templates/index.html
+++ b/sigal/themes/colorbox/templates/index.html
@@ -62,7 +62,7 @@
                       {% if loop.index % 3 == 1 %}alpha{% endif%}
                       {% if loop.index % 3 == 0 %}omega{% endif%}">
             <a href="{{ album.url }}">
-              <img src="{{ album.thumb }}" class="album_thumb"
+              <img src="{{ album.thumbnail }}" class="album_thumb"
                    alt="{{ album.name }}" title="{{ album.name }}" /></a>
             <span class="album_title">{{ album.title }}</span>
           </div>
@@ -84,30 +84,30 @@
           {%- endmacro %}
         <div id="gallery" class="row">
           {% for media in medias %}
-            {% if media.type == "img" %}
+            {% if media.type == "image" %}
             <div class="four columns thumbnail
                         {% if loop.index % 3 == 1 %}alpha{% endif%}
                         {% if loop.index % 3 == 0 %}omega{% endif%}">
-              <a href="{{ media.file }}" class="gallery" title="{{ media.file }}" {{ img_description(media) }}>
-                <img src="{{ media.thumb }}" alt="{{ media.file }}"
-                    title="{{ media.file }}" /></a>
+              <a href="{{ media.filename }}" class="gallery" title="{{ media.filename }}" {{ img_description(media) }}>
+                <img src="{{ media.thumbnail }}" alt="{{ media.filename }}"
+                    title="{{ media.filename }}" /></a>
             </div>
             {% endif %}
-            {% if media.type == "vid" %}
+            {% if media.type == "video" %}
               <div class="four columns thumbnail
                           {% if loop.index % 3 == 1 %}alpha{% endif%}
                           {% if loop.index % 3 == 0 %}omega{% endif%}">
-                <a href="#{{ media.file|replace('.', '')|replace(' ', '') }}"
-                  class="gallery" inline='yes' title="{{ media.file }}"
+                <a href="#{{ media.filename|replace('.', '')|replace(' ', '') }}"
+                  class="gallery" inline='yes' title="{{ media.filename }}"
                   {% if media.big %} data-big="{{ media.big }}"{% endif %}>
-                  <img src="{{ media.thumb }}" alt="{{ media.file }}"
-                      title="{{ media.file }}" /></a>
+                  <img src="{{ media.thumbnail }}" alt="{{ media.filename }}"
+                      title="{{ media.filename }}" /></a>
               </div>
               <!-- This contains the hidden content for the video -->
               <div style='display:none'>
-                <div id="{{ media.file|replace('.', '')|replace(' ', '') }}">
+                <div id="{{ media.filename|replace('.', '')|replace(' ', '') }}">
                   <video controls>
-                  <source src='{{ media.file }}' type='video/webm' />
+                  <source src='{{ media.filename }}' type='video/webm' />
                   </video>
                 </div>
               </div>
@@ -116,10 +116,10 @@
         </div>
         {% endif %}
 
-        {% if zip_gallery %}
+        {% if zip %}
         <div id="additionnal-infos" class="row">
           <p>
-            <a href="{{ zip_gallery }}"
+            <a href="{{ zip }}"
                title="Download a zip archive with all images">Download ZIP</a>
           </p>
         </div>
diff --git a/sigal/themes/galleria/templates/index.html b/sigal/themes/galleria/templates/index.html
index 2e23d49..a858c9c 100644
--- a/sigal/themes/galleria/templates/index.html
+++ b/sigal/themes/galleria/templates/index.html
@@ -49,7 +49,7 @@
           <ul>
             {% for album in albums %}
             <li><a href="{{ album.url }}">
-              <img src="{{ album.thumb }}" class="album_thumb" alt="{{ album.name }}" title="{{ album.name }}" /></a>
+              <img src="{{ album.thumbnail }}" class="album_thumb" alt="{{ album.name }}" title="{{ album.name }}" /></a>
               <span class="album_title">{{ album.title }}</span>
             </li>
             {% endfor %}
@@ -73,18 +73,18 @@
           {%- endmacro %}
         <div id="gallery">
           {% for media in medias %}
-            {% if media.type == "img" %}
-              <a href="{{ media.file }}">
-                <img src="{{ media.thumb }}" alt="{{ media.file }}"
-                    data-title="{{ media.file }}"
+            {% if media.type == "image" %}
+              <a href="{{ media.filename }}">
+                <img src="{{ media.thumbnail }}" alt="{{ media.filename }}"
+                    data-title="{{ media.filename }}"
                     data-description="{{ img_description(media) }}"/>
               </a>
             {% endif %}
-            {% if media.type == "vid" %}
+            {% if media.type == "video" %}
               <a href="{{ theme.url }}/img/empty.png">
-                <img src="{{ media.thumb }}" alt="{{ media.file }}"
+                <img src="{{ media.thumbnail }}" alt="{{ media.filename }}"
                      data-layer="<video controls>
-                                   <source src='{{ media.file }}' type='video/webm' />
+                                   <source src='{{ media.filename }}' type='video/webm' />
                                  </video>" />
               </a>
             {% endif %}
@@ -92,10 +92,10 @@
         </div>
         {% endif %}
 
-        {% if zip_gallery %}
+        {% if zip %}
         <div id="additionnal-infos" class="row">
           <p>
-            <a href="{{ zip_gallery }}"
+            <a href="{{ zip }}"
                title="Download a zip archive with all images">Download ZIP</a>
           </p>
         </div>
diff --git a/sigal/writer.py b/sigal/writer.py
index 20677be..77c66bb 100644
--- a/sigal/writer.py
+++ b/sigal/writer.py
@@ -24,7 +24,6 @@
 from __future__ import absolute_import
 
 import codecs
-import copy
 import jinja2
 import logging
 import os
@@ -34,9 +33,6 @@ from distutils.dir_util import copy_tree
 from jinja2 import Environment, FileSystemLoader, ChoiceLoader, PrefixLoader
 from jinja2.exceptions import TemplateNotFound
 
-import sigal.image
-import sigal.video
-from .settings import get_thumb, get_orig
 from .pkgmeta import __url__ as sigal_link
 
 THEMES_PATH = os.path.normpath(os.path.join(
@@ -46,17 +42,14 @@ THEMES_PATH = os.path.normpath(os.path.join(
 class Writer(object):
     """Generate html pages for each directory of images."""
 
-    def __init__(self, settings, output_dir, theme=None,
-                 template_file="index.html", output_file="index.html"):
-        self.settings = settings
-        self.output_dir = os.path.abspath(output_dir)
-        self.theme = theme or settings['theme']
-        self.template_file = template_file
-        self.output_file = output_file
-        self.logger = logging.getLogger(__name__)
+    template_file = 'index.html'
 
-        # optionally add index.html to the URLs
-        self.url_ext = self.output_file if settings['index_in_url'] else ''
+    def __init__(self, settings, theme=None, index_title=''):
+        self.settings = settings
+        self.output_dir = settings['destination']
+        self.theme = theme or settings['theme']
+        self.index_title = index_title
+        self.logger = logging.getLogger(__name__)
 
         # search the theme in sigal/theme if the given one does not exists
         if not os.path.exists(self.theme):
@@ -66,8 +59,8 @@ class Writer(object):
 
         self.logger.info("Theme  : %s", self.theme)
         theme_relpath = os.path.join(self.theme, 'templates')
-        default_loader = FileSystemLoader(
-            os.path.join(THEMES_PATH, 'default', 'templates'))
+        default_loader = FileSystemLoader(os.path.join(THEMES_PATH, 'default',
+                                                       'templates'))
 
         # setup jinja env
         env_options = {'trim_blocks': True}
@@ -94,119 +87,36 @@ class Writer(object):
 
         self.copy_assets()
 
-        self.ctx = {
-            'sigal_link': sigal_link,
-            'theme': {'name': os.path.basename(self.theme)},
-            'medias': [],
-            'albums': [],
-            'breadcrumb': ''
-        }
-
     def copy_assets(self):
         """Copy the theme files in the output dir."""
 
         self.theme_path = os.path.join(self.output_dir, 'static')
         copy_tree(os.path.join(self.theme, 'static'), self.theme_path)
 
-    def get_breadcrumb(self, paths, relpath):
-        """Paths to upper directories (with titles and links)."""
-
-        tmp_path = relpath
-        breadcrumb = [((self.url_ext or '.'), paths[tmp_path]['title'])]
-
-        while True:
-            tmp_path = os.path.normpath(os.path.join(tmp_path, '..'))
-            if tmp_path == '.':
-                break
-
-            url = os.path.relpath(tmp_path, relpath) + '/' + self.url_ext
-            breadcrumb.append((url, paths[tmp_path]['title']))
-
-        return reversed(breadcrumb)
-
-    def generate_context(self, paths, relpath):
+    def generate_context(self, albums, relpath, album):
         """Generate the context dict for the given path."""
 
-        path = os.path.normpath(os.path.join(self.output_dir, relpath))
-        index_url = os.path.relpath(self.output_dir, path) + '/' + self.url_ext
-        self.logger.info("Output path : %s", path)
+        self.logger.info("Output album : %s", album.dst_path)
 
-        ctx = copy.deepcopy(self.ctx)
-        ctx.update({
+        ctx = {
+            'index_title': self.index_title,
             'settings': self.settings,
-            'index_url': index_url,
-            'index_title': paths['.']['title']
-        })
-        ctx['theme']['url'] = os.path.relpath(self.theme_path, path)
+            'sigal_link': sigal_link,
+            'theme': {'name': os.path.basename(self.theme),
+                      'url': os.path.relpath(self.theme_path, album.dst_path)},
+        }
 
-        if relpath != '.':
-            ctx['breadcrumb'] = self.get_breadcrumb(paths, relpath)
-
-        if len(paths[relpath]['medias']) > 0 and self.settings['zip_gallery']:
-            ctx['zip_gallery'] = self.settings['zip_gallery']
-
-        for i in paths[relpath]['medias']:
-            media_ctx = {}
-            base, ext = os.path.splitext(i)
-            if ext in self.settings['img_ext_list']:
-                media_ctx['type'] = 'img'
-                media_ctx['file'] = i
-
-                file_path = os.path.join(path, i)
-                raw, simple = sigal.image.get_exif_tags(file_path)
-
-                if raw is not None:
-                    media_ctx['raw_exif'] = raw
-                if simple is not None:
-                    media_ctx['exif'] = simple
-            else:
-                media_ctx['type'] = 'vid'
-                media_ctx['file'] = base + '.webm'
-            media_ctx['thumb'] = get_thumb(self.settings, i)
-            if self.settings['keep_orig']:
-                media_ctx['big'] = get_orig(self.settings, i)
-            ctx['medias'].append(media_ctx)
-
-        for d in paths[relpath]['subdir']:
-            dpath = os.path.normpath(os.path.join(relpath, d))
-            alb_thumb = paths[dpath]['thumbnail']
-            thumb_name = get_thumb(self.settings, alb_thumb)
-            thumb_path = os.path.join(self.output_dir, dpath, thumb_name)
-            self.logger.debug("Thumbnail path : %s", thumb_path)
-
-            # generate the thumbnail if it is missing (if
-            # settings['make_thumbs'] is False)
-            if not os.path.isfile(thumb_path):
-                source = os.path.join(self.output_dir, dpath, alb_thumb)
-                ext = os.path.splitext(source)[1]
-                self.logger.debug("Generating thumbnail for %s", source)
-
-                if ext in self.settings['img_ext_list']:
-                    generator = sigal.image.generate_thumbnail
-                elif ext in self.settings['vid_ext_list']:
-                    generator = sigal.video.generate_thumbnail
-                else:
-                    generator = None
-                    self.logger.error('Unsupported file type for %s', source)
-
-                if generator:
-                    generator(source, thumb_path, self.settings['thumb_size'],
-                              fit=self.settings['thumb_fit'])
-
-            ctx['albums'].append({
-                'url': d + '/' + self.url_ext,
-                'title': paths[dpath]['title'],
-                'thumb': os.path.join(d, thumb_name)
-            })
+        for attr in ('albums', 'breadcrumb', 'index_url', 'medias', 'zip'):
+            ctx[attr] = getattr(album, attr)
 
         return ctx
 
-    def write(self, paths, relpath):
+    def write(self, albums, path, album):
         """Generate the HTML page and save it."""
 
-        ctx = self.generate_context(paths, relpath)
-        page = self.template.render(paths[relpath], **ctx)
+        ctx = self.generate_context(albums, path, album)
+        page = self.template.render(**ctx)
 
-        output_file = os.path.join(self.output_dir, relpath, self.output_file)
+        output_file = os.path.join(album.dst_path, album.output_file)
         with codecs.open(output_file, 'w', 'utf-8') as f:
             f.write(page)