diff --git a/bin/isimage b/bin/isimage
new file mode 100755
index 0000000000000000000000000000000000000000..428fc23b6889216cafcd0659f00e372aa7505e23
--- /dev/null
+++ b/bin/isimage
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Started 10/05/2011 by Seblu <seblu@seblu.net>
+
+'''
+InstallSystems Image Manipulation Tool
+'''
+
+import os
+import argparse
+import installsystems
+import installsystems.printer as p
+
+class DebugAction(argparse.Action):
+    '''Set installsystems in debug mode. Argparse callback'''
+    def __call__(self, parser, namespace, values, option_string=None):
+        installsystems.debug = True
+        p.debug("Debug on")
+
+
+def init(options):
+    '''Create an empty fresh source image tree'''
+    # Directory must not exists
+    if os.path.exists(options.path) and os.path.isdir(options.path):
+        p.error("Directory already exists: %s" % options.path)
+    # Check if parent path is writable
+    parent_path = os.path.abspath(os.path.join(options.path, "../"))
+    if not os.access(parent_path, os.W_OK):
+        p.error("%s is not writable."%parent_path)
+    # call init from library
+    try:
+        simg = installsystems.image.SourceImage(options.path, create=True)
+    except Exception as e:
+        p.error("init failed: %s." % e)
+
+def build(options):
+    '''Create a package image'''
+    for d in ("", "parser", "setup", "data"):
+        rp = os.path.join(options.path, d)
+        if not os.path.exists(rp):
+            p.error("Missing directory: %s" % rp)
+        if not os.path.isdir(rp):
+            p.error("Not a directory: %s" % rp)
+        if not os.access(rp, os.R_OK|os.X_OK):
+            p.error("Unable to access to %s" % rp)
+    try:
+        simg = installsystems.image.SourceImage(options.path)
+        simg.build()
+    except Exception as e:
+        p.error("build failed: %s." % e)
+
+# Top level argument parsing
+p_main = argparse.ArgumentParser()
+p_main.add_argument("-v", "--version", action="version", version=installsystems.version,
+                    help="show installsystems version")
+p_main.add_argument('-d', "--debug", action=DebugAction, nargs=0,
+                    help="active debug mode")
+subparsers = p_main.add_subparsers()
+# Init command parser
+p_init = subparsers.add_parser("init", help=init.__doc__)
+p_init.add_argument("path", help="Path of new image directory")
+p_init.set_defaults(func=init)
+# Build command parser
+p_build =  subparsers.add_parser("build", help=build.__doc__)
+p_build.add_argument("path", nargs="?", type=str, default=".")
+p_build.set_defaults(func=build)
+# Parse and run
+args = p_main.parse_args()
+args.func(args)
diff --git a/installsystems/__init__.py b/installsystems/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..d7e602630ae5f727339fd507db3902d5a2ce080f
--- /dev/null
+++ b/installsystems/__init__.py
@@ -0,0 +1,14 @@
+# -*- python -*-
+# -*- coding: utf-8 -*-
+# Started 10/05/2011 by Seblu <seblu@seblu.net>
+
+'''
+InstallSystems module
+'''
+
+canonical_name="installsystems"
+version = "1-dev"
+debug = False
+
+import printer
+import image
diff --git a/installsystems/image.py b/installsystems/image.py
new file mode 100644
index 0000000000000000000000000000000000000000..e3bffa1257be956bc8e593e307cb3589d9cd16d9
--- /dev/null
+++ b/installsystems/image.py
@@ -0,0 +1,268 @@
+# -*- python -*-
+# -*- coding: utf-8 -*-
+# Started 10/05/2011 by Seblu <seblu@seblu.net>
+
+'''
+Image stuff
+'''
+
+import os
+import stat
+import datetime
+import time
+import tarfile
+import json
+import hashlib
+import StringIO
+import ConfigParser
+import subprocess
+import installsystems.printer as p
+import installsystems.template
+
+image_extension = ".img.tar.bz2"
+image_format = "1"
+
+class Image(object):
+    '''Abstract class of images'''
+
+    def __init__(self, pbzip2=True):
+        self.pbzip2_path = self.path_search("pbzip2") if pbzip2 else None
+
+    def path_search(self, name, path=None):
+        '''Search in PATH for a binary'''
+        path = path or os.environ["PATH"]
+        for d in path.split(os.pathsep):
+            if os.path.exists(os.path.join(d, name)):
+                return os.path.join(os.path.abspath(d), name)
+        return None
+
+    def md5_checksum(self, path):
+        '''Compute md5 of a file'''
+        m = hashlib.md5()
+        m.update(open(path, "r").read())
+        return m.hexdigest()
+
+class SourceImage(Image):
+    '''Image source manipulation class'''
+
+    def __init__(self, path, verbose=True, create=False, pbzip2=True):
+        Image.__init__(self, pbzip2)
+        self.base_path = path
+        self.parser_path = os.path.join(path, "parser")
+        self.setup_path = os.path.join(path, "setup")
+        self.data_path = os.path.join(path, "data")
+        self.verbose = verbose
+        if create:
+            self.create()
+        self.description = self.parse_description()
+
+    def create(self):
+        '''Create an empty source image'''
+        # create base directories
+        if self.verbose: p.arrow("Creating base directories")
+        try:
+            for d in (self.base_path, self.parser_path, self.setup_path, self.data_path):
+                os.mkdir(d)
+        except Exception as e:
+            raise Exception("Unable to create directory %s: %s" % (d, e))
+        # create example files
+        if self.verbose: p.arrow("Creating examples")
+        try:
+            # create description example from template
+            if self.verbose: p.arrow2("Creating description example")
+            open(os.path.join(self.base_path, "description"), "w").write(
+                installsystems.template.description)
+            # create parser example from template
+            if self.verbose: p.arrow2("Creating parser script example")
+            open(os.path.join(self.parser_path, "01-parser.py"), "w").write(
+                installsystems.template.parser)
+            # create setup example from template
+            if self.verbose: p.arrow2("Creating setup script example")
+            open(os.path.join(self.setup_path, "01-setup.py"), "w").write(
+                installsystems.template.setup)
+        except Exception as e:
+            raise Exception("Unable to example file: %s" % e)
+        try:
+            # setting rights on files in setup and parser
+            if self.verbose: p.arrow2("Setting executable rights on scripts")
+            umask = os.umask(0)
+            os.umask(umask)
+            for path in (self.parser_path, self.setup_path):
+                for f in os.listdir(path):
+                    pf = os.path.join(path, f)
+                    os.chmod(pf, 0777 & ~umask)
+        except Exception as e:
+            raise Exception("Unable to set rights on %s: %s" % (pf, e))
+
+    def build(self):
+        '''Create packaged image'''
+        t0 = time.time()
+        # compute script tarball paths
+        tarpath = os.path.join(self.base_path,
+                               "%s-%s%s" % (self.description["name"],
+                                            self.description["version"],
+                                            image_extension))
+        # check if free to create script tarball
+        if os.path.exists(tarpath):
+            raise Exception("Tarbal already exists. Remove it before")
+        # printing pbzip2 status
+        if self.verbose:
+            if self.pbzip2_path:
+                p.arrow("Parallel bzip2 enabled (%s)" % self.pbzip2_path)
+            else:
+                p.arrow("Parallel bzip disabled")
+        #  Create data tarballs
+        data_d = self.create_data_tarballs()
+        # generate .description.json
+        jdesc = self.generate_json_description()
+        # creating scripts tarball
+        if self.verbose: p.arrow("Creating scripts tarball")
+        if self.verbose: p.arrow2("Name %s" % os.path.relpath(tarpath))
+        try:
+            tarball = tarfile.open(tarpath, mode="w:bz2", dereference=True)
+        except Exception as e:
+            raise Exception("Unable to create tarball %s: %s" % (tarpath, e))
+        # add .description.json
+        if self.verbose: p.arrow2("Add .description.json")
+        self.tar_add_str(tarball, tarfile.REGTYPE, 0444, ".description.json", jdesc)
+        # add .format
+        if self.verbose: p.arrow2("Add .format")
+        self.tar_add_str(tarball, tarfile.REGTYPE, 0444, ".format", image_format)
+        # add parser scripts
+        if self.verbose: p.arrow2("Add parser scripts")
+        tarball.add(self.parser_path, arcname="parser",
+                    recursive=True, filter=self.tar_scripts_filter)
+        # add setup scripts
+        if self.verbose: p.arrow2("Add setup scripts")
+        tarball.add(self.setup_path, arcname="setup",
+                    recursive=True, filter=self.tar_scripts_filter)
+        # closing tarball file
+        tarball.close()
+        # compute building time
+        t1 = time.time()
+        dt = int(t1 - t0)
+        if self.verbose: p.arrow("Build time: %s" % datetime.timedelta(seconds=dt))
+
+    def data_tarballs(self):
+        '''List all data tarballs in data directory'''
+        databalls = dict()
+        for dname in os.listdir(self.data_path):
+            filename = "%s-%s-%s%s" % (self.description["name"],
+                                       self.description["version"],
+                                       dname,
+                                       image_extension)
+            databalls[filename] = os.path.abspath(os.path.join(self.data_path, dname))
+        return databalls
+
+    def create_data_tarballs(self):
+        '''Create all data tarballs in data directory'''
+        if self.verbose: p.arrow("Creating data tarballs")
+        # build list of data tarball candidate
+        candidates = self.data_tarballs()
+        if len(candidates) == 0:
+            if self.verbose: p.arrow2("No data tarball")
+            return
+        # create tarballs
+        for candidate in candidates:
+            path = os.path.join(self.base_path, candidate)
+            if os.path.exists(path):
+                if self.verbose: p.arrow2("Tarball %s already exists." % candidate)
+            else:
+                if self.verbose: p.arrow2("Creating tarball %s" % candidate)
+                self.create_data_tarball(path, candidates[candidate])
+
+    def create_data_tarball(self, tar_path, data_path):
+        '''Create a data tarball'''
+        dname = os.path.basename(data_path)
+        try:
+            # opening file
+            if self.pbzip2_path:
+                tb = open(tar_path, mode="w")
+                p = subprocess.Popen(self.pbzip2_path, shell=False, close_fds=True,
+                                     stdin=subprocess.PIPE, stdout=tb.fileno())
+                tarball = tarfile.open(mode="w|", dereference=True, fileobj=p.stdin)
+            else:
+                tarball = tarfile.open(tar_path, "w:bz2", dereference=True)
+            tarball.add(data_path, arcname=dname, recursive=True)
+            # closing tarball file
+            tarball.close()
+            if self.pbzip2_path:
+                # closing pipe, needed to end pbzip2
+                p.stdin.close()
+                # waiting pbzip to terminate
+                r = p.wait()
+                # cleaning openfile
+                tb.close()
+                # status
+                if r != 0:
+                    raise Exception("Data tarball %s creation return %s" % (tar_path, r))
+        except Exception as e:
+            raise Exception("Unable to create data tarball %s: %s" % (tar_path, e))
+
+    def tar_add_str(self, tarball, ftype, mode, name, content):
+        '''Add a string in memory as a file in tarball'''
+        ti = tarfile.TarInfo(name)
+        ti.type = ftype
+        ti.mode = mode
+        ti.mtime = int(time.time())
+        ti.uid = ti.gid = 0
+        ti.uname = ti.gname = "root"
+        ti.size = len(content) if content is not None else 0
+        tarball.addfile(ti, StringIO.StringIO(content))
+
+    def tar_scripts_filter(self, tinfo):
+        '''Filter files which can be included in scripts tarball'''
+        if not tinfo.name in ("parser", "setup") and os.path.splitext(tinfo.name)[1] != ".py":
+            return None
+        tinfo.mode = 0555
+        tinfo.uid = tinfo.gid = 0
+        tinfo.uname = tinfo.gname = "root"
+        return tinfo
+
+    def generate_json_description(self):
+        '''Generate a json description file'''
+        if self.verbose: p.arrow("Generating JSON description")
+        # copy description
+        desc = self.description.copy()
+        # timestamp image
+        if self.verbose: p.arrow2("Timestamping")
+        desc["date"] = int(time.time())
+        # append data tarballs info
+        desc["data"] = dict()
+        for dt in self.data_tarballs():
+            if self.verbose: p.arrow2("Compute MD5 of %s" % dt)
+            path = os.path.join(self.base_path, dt)
+            desc["data"][dt] = { "size": os.path.getsize(path),
+                                 "md5": self.md5_checksum(path) }
+        # create file
+        filedesc = StringIO.StringIO()
+        # serialize
+        return json.dumps(desc)
+
+    def parse_description(self):
+        '''Raise an exception is description file is invalid and return vars to include'''
+        if self.verbose: p.arrow("Parsing description")
+        d = dict()
+        try:
+            descpath = os.path.join(self.base_path, "description")
+            cp = ConfigParser.RawConfigParser()
+            cp.read(descpath)
+            for n in ("name","version", "description", "author"):
+                d[n] = cp.get("image", n)
+        except Exception as e:
+            raise Exception("description: %s" % e)
+        return d
+
+class PackageImage(Image):
+    '''Packaged image manipulation class'''
+
+    def __init__(self, path):
+        Image.__init__(self)
+        self.path = path
+
+class DataImage(Image):
+    '''Data image manipulation class'''
+
+    def __init__(self, path):
+        Image.__init__(self)
+        self.path = path
diff --git a/installsystems/printer.py b/installsystems/printer.py
new file mode 100644
index 0000000000000000000000000000000000000000..53b9bfa0848c847d940e3c2f102e97aac081e52f
--- /dev/null
+++ b/installsystems/printer.py
@@ -0,0 +1,72 @@
+# -*- python -*-
+# -*- coding: utf-8 -*-
+# Started 10/05/2011 by Seblu <seblu@seblu.net>
+
+'''
+Install Systems Printer module
+'''
+
+import sys
+import os
+import signal
+import installsystems
+
+color = {
+    # regular
+    "black": "\033[30m",
+    "red": "\033[31m",
+    "green": "\033[32m",
+    "yellow": "\033[33m",
+    "blue": "\033[34m",
+    "purple": "\033[35m",
+    "cyan": "\033[36m",
+    "white": "\033[37m",
+    # others
+    "under": "\033[4m",
+    "light": "\033[1m",
+    "reset": "\033[m",
+    }
+
+def out(message="", fd=sys.stdout, endl=os.linesep, flush=True):
+    '''Print message colorised in fd ended by endl'''
+    # color subsitution
+    for c in color:
+        message = message.replace("#%s#" % c, color[c])
+    # printing
+    fd.write("%s%s" % (message, endl))
+    if flush:
+        fd.flush()
+
+def err(message, fd=sys.stderr, endl=os.linesep):
+    '''Print a message on stderr'''
+    out(message, fd, endl)
+
+def fatal(message, quit=True, fd=sys.stderr, endl=os.linesep):
+    out("#light##red#Fatal:#reset# #red#%s#reset#" % message, fd, endl)
+    if sys.exc_info()[0] is not None and installsystems.debug:
+        raise
+    if quit:
+        os._exit(21)
+
+def error(message, quit=True, fd=sys.stderr, endl=os.linesep):
+    out("#light##red#Error:#reset# #red#%s#reset#" % message, fd, endl)
+    if sys.exc_info()[0] is not None and installsystems.debug:
+        raise
+    if quit:
+        exit(42)
+
+def warn(message, fd=sys.stderr, endl=os.linesep):
+    out("#light##yellow#Warning:#reset# #yellow#%s#reset#" % message, fd, endl)
+
+def info(message, fd=sys.stderr, endl=os.linesep):
+    out("#light#Info%s:#reset# %s" % message, fd, endl)
+
+def debug(message, fd=sys.stderr, endl=os.linesep):
+    if installsystems.debug:
+        out("#light##black#%s#reset#" % message, fd, endl)
+
+def arrow(message, fd=sys.stdout, endl=os.linesep):
+    out("#light##red#=>#reset# %s" % message)
+
+def arrow2(message, fd=sys.stdout, endl=os.linesep):
+    out(" #light##yellow#=>#reset# %s" % message)
diff --git a/installsystems/template.py b/installsystems/template.py
new file mode 100644
index 0000000000000000000000000000000000000000..c70c858f492e5e6d74f45dc76e3ebddfeb04116d
--- /dev/null
+++ b/installsystems/template.py
@@ -0,0 +1,30 @@
+# -*- python -*-
+# -*- coding: utf-8 -*-
+# Started 12/05/2011 by Seblu <seblu@seblu.net>
+
+description = """[image]
+name =
+version =
+description =
+author =
+"""
+
+parser = """# -*- python -*-
+# -*- coding: utf-8 -*-
+
+def parser(image):
+\t'''Method called by parser'''
+\t\t pass
+
+# vim:set ts=2 sw=2 noet:
+"""
+
+setup = """# -*- python -*-
+# -*- coding: utf-8 -*-
+
+def setup(image):
+\t'''Method called by installer'''
+\tpass
+
+# vim:set ts=2 sw=2 noet:
+"""