diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
diff --git a/doc/AUTHORS b/doc/AUTHORS
@@ -48,3 +48,4 @@ Sergey Yakushev	<yakushevs at gmail.com >
 René-Luc D'Hont	<rldhont at gmail.com>
 Etienne Tourigny	<etourigny.dev at gmail.com>
 Larry Shaffer	<larrys at dakotacarto.com>
+Victor Olaya <volayaf at gmail.com>
diff --git a/python/plugins/CMakeLists.txt b/python/plugins/CMakeLists.txt
@@ -4,4 +4,4 @@ ADD_SUBDIRECTORY(fTools)
 ADD_SUBDIRECTORY(GdalTools)
 ADD_SUBDIRECTORY(osm)
 ADD_SUBDIRECTORY(db_manager)
-#ADD_SUBDIRECTORY(sextante)
+ADD_SUBDIRECTORY(sextante)
diff --git a/python/plugins/sextante/.gitignore b/python/plugins/sextante/.gitignore
diff --git a/python/plugins/sextante/CMakeLists.txt b/python/plugins/sextante/CMakeLists.txt
@@ -0,0 +1,28 @@
+SET (SEXTANTE_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/sextante)
+
+ADD_SUBDIRECTORY(about)
+ADD_SUBDIRECTORY(algs)
+ADD_SUBDIRECTORY(core)
+ADD_SUBDIRECTORY(ftools)
+ADD_SUBDIRECTORY(gdal)
+ADD_SUBDIRECTORY(grass)
+ADD_SUBDIRECTORY(gui)
+ADD_SUBDIRECTORY(help)
+ADD_SUBDIRECTORY(images)
+ADD_SUBDIRECTORY(lidar)
+ADD_SUBDIRECTORY(mmqgisx)
+ADD_SUBDIRECTORY(modeler)
+ADD_SUBDIRECTORY(otb)
+ADD_SUBDIRECTORY(outputs)
+ADD_SUBDIRECTORY(parameters)
+ADD_SUBDIRECTORY(pymorph)
+ADD_SUBDIRECTORY(r)
+ADD_SUBDIRECTORY(saga)
+ADD_SUBDIRECTORY(script)
+#ADD_SUBDIRECTORY(tests)
+
+FILE(GLOB OTHER_FILES metadata.txt)
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR})
+INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR})
diff --git a/python/plugins/sextante/about/CMakeLists.txt b/python/plugins/sextante/about/CMakeLists.txt
@@ -0,0 +1,5 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB OTHER_FILES *.htm *.png)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/about)
+INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/about)
diff --git a/python/plugins/sextante/algs/CMakeLists.txt b/python/plugins/sextante/algs/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/algs)
diff --git a/python/plugins/sextante/core/CMakeLists.txt b/python/plugins/sextante/core/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/core)
diff --git a/python/plugins/sextante/core/SextanteVectorWriter.py b/python/plugins/sextante/core/SextanteVectorWriter.py
@@ -0,0 +1,49 @@
+from PyQt4.QtCore import *
+
+from qgis.core import *
+
+class SextanteVectorWriter:
+
+    MEMORY_LAYER_PREFIX = "memory:"
+
+    TYPE_MAP = {QGis.WKBPoint : "Point",
+                QGis.WKBLineString : "LineString",
+                QGis.WKBPolygon : "Polygon",
+                QGis.WKBMultiPoint : "MultiPoint",
+                QGis.WKBMultiLineString : "MultiLineString",
+                QGis.WKBMultiPolygon : "MultiPolygon"
+               }
+
+    def __init__(self, fileName, encoding, fields, geometryType, crs, options=None):
+        self.fileName = fileName
+        self.isMemory = False
+        self.memLayer = None
+        self.writer = None
+
+        if self.fileName.startswith(self.MEMORY_LAYER_PREFIX):
+            self.isMemory = True
+
+            uri = self.TYPE_MAP[geometryType]
+            if crs.isValid():
+              uri += "?crs=" + crs.authid()
+            self.memLayer = QgsVectorLayer(uri, self.fileName, "memory")
+            self.writer = self.memLayer.dataProvider()
+            self.writer.addAttributes(fields.values())
+            self.memLayer.updateFieldMap()
+        else:
+            formats = QgsVectorFileWriter.supportedFiltersAndFormats()
+            OGRCodes = {}
+            for key, value in formats.items():
+                extension = str(key)
+                extension = extension[extension.find('*.') + 2:]
+                extension = extension[:extension.find(" ")]
+                OGRCodes[extension] = value
+
+            extension = self.fileName[self.fileName.find(".") + 1:]
+            self.writer = QgsVectorFileWriter(self.fileName, encoding, fields, geometryType, crs, OGRCodes[extension])
+
+    def addFeature(self, feature):
+        if self.isMemory:
+            self.writer.addFeatures([feature])
+        else:
+            self.writer.addFeature(feature)
diff --git a/python/plugins/sextante/ftools/CMakeLists.txt b/python/plugins/sextante/ftools/CMakeLists.txt
@@ -0,0 +1,7 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB OTHER_FILES copyright.txt)
+FILE(GLOB ICON_FILES icons/*.png)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/ftools)
+INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/ftools)
+INSTALL(FILES ${ICON_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/ftools/icons)
diff --git a/python/plugins/sextante/gdal/CMakeLists.txt b/python/plugins/sextante/gdal/CMakeLists.txt
@@ -0,0 +1,7 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB ICON_FILES icons/*.png)
+
+ADD_SUBDIRECTORY(scripts)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/gdal)
+INSTALL(FILES ${ICON_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/gdal/icons)
diff --git a/python/plugins/sextante/gdal/scripts/CMakeLists.txt b/python/plugins/sextante/gdal/scripts/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/gdal/scripts)
diff --git a/python/plugins/sextante/grass/CMakeLists.txt b/python/plugins/sextante/grass/CMakeLists.txt
@@ -0,0 +1,7 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB OTHER_FILES grass.txt)
+FILE(GLOB DESCR_FILES description/*.txt)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/grass)
+INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/grass)
+INSTALL(FILES ${DESCR_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/grass/description)
diff --git a/python/plugins/sextante/gui/CMakeLists.txt b/python/plugins/sextante/gui/CMakeLists.txt
@@ -0,0 +1,5 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB OTHER_FILES help/*.*)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/gui)
+INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/gui/help)
diff --git a/python/plugins/sextante/help/CMakeLists.txt b/python/plugins/sextante/help/CMakeLists.txt
@@ -0,0 +1,9 @@
+FILE(GLOB HTML_FILES *.html)
+FILE(GLOB OTHER_FILES *.js)
+FILE(GLOB IMAGE_FILES _images/*.*)
+FILE(GLOB STATIC_FILES _static/*.*)
+
+INSTALL(FILES ${HTML_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/help)
+INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/help)
+INSTALL(FILES ${IMAGE_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/help/_images)
+INSTALL(FILES ${STATIC_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/help/_static)
diff --git a/python/plugins/sextante/images/CMakeLists.txt b/python/plugins/sextante/images/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB IMAGE_FILES *.png)
+
+INSTALL(FILES ${IMAGE_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/images)
diff --git a/python/plugins/sextante/lidar/CMakeLists.txt b/python/plugins/sextante/lidar/CMakeLists.txt
@@ -0,0 +1,6 @@
+FILE(GLOB PY_FILES *.py)
+
+ADD_SUBDIRECTORY(fusion)
+ADD_SUBDIRECTORY(lastools)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/lidar)
diff --git a/python/plugins/sextante/lidar/fusion/CMakeLists.txt b/python/plugins/sextante/lidar/fusion/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/lidar/fusion)
diff --git a/python/plugins/sextante/lidar/lastools/CMakeLists.txt b/python/plugins/sextante/lidar/lastools/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/lidar/lastools)
diff --git a/python/plugins/sextante/mmqgisx/CMakeLists.txt b/python/plugins/sextante/mmqgisx/CMakeLists.txt
@@ -0,0 +1,7 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB OTHER_FILES copyright.txt)
+FILE(GLOB ICON_FILES icons/*.png)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/mmqgisx)
+INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/mmqgisx)
+INSTALL(FILES ${ICON_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/mmqgisx/icons)
diff --git a/python/plugins/sextante/modeler/CMakeLists.txt b/python/plugins/sextante/modeler/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/modeler)
diff --git a/python/plugins/sextante/modeler/ModelerUtils.py b/python/plugins/sextante/modeler/ModelerUtils.py
@@ -1,4 +1,5 @@
 import os
+from sextante.core.SextanteUtils import SextanteUtils
 from sextante.core.SextanteUtils import mkdir
 from sextante.core.SextanteConfig import SextanteConfig
 
@@ -11,8 +12,8 @@ class ModelerUtils:
     def modelsFolder():
         folder = SextanteConfig.getSetting(ModelerUtils.MODELS_FOLDER)
         if folder == None:
-            folder = os.path.join(os.path.dirname(__file__), "models")
-            #folder = SextanteUtils.userFolder() + os.sep + "models"
+            #folder = os.path.join(os.path.dirname(__file__), "models")
+            folder = SextanteUtils.userFolder() + os.sep + "models"
         mkdir(folder)
 
         return folder

diff --git a/python/plugins/sextante/otb/CMakeLists.txt b/python/plugins/sextante/otb/CMakeLists.txt
@@ -0,0 +1,7 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB DESCR_FILES description/*.txt)
+FILE(GLOB HELPER_FILES helper/*.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/otb)
+INSTALL(FILES ${DESCR_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/otb/description)
+INSTALL(FILES ${HELPER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/otb/helper)
diff --git a/python/plugins/sextante/outputs/CMakeLists.txt b/python/plugins/sextante/outputs/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/outputs)
diff --git a/python/plugins/sextante/parameters/CMakeLists.txt b/python/plugins/sextante/parameters/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/parameters)
diff --git a/python/plugins/sextante/pymorph/CMakeLists.txt b/python/plugins/sextante/pymorph/CMakeLists.txt
@@ -0,0 +1,8 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB OTHER_FILES algnames.txt)
+
+ADD_SUBDIRECTORY(html)
+ADD_SUBDIRECTORY(scripts)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph)
+INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph)
diff --git a/python/plugins/sextante/pymorph/html/CMakeLists.txt b/python/plugins/sextante/pymorph/html/CMakeLists.txt
@@ -0,0 +1,5 @@
+FILE(GLOB HTML_FILES *.html)
+
+ADD_SUBDIRECTORY(morph)
+
+INSTALL(FILES ${HTML_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html)
diff --git a/python/plugins/sextante/pymorph/html/morph/CMakeLists.txt b/python/plugins/sextante/pymorph/html/morph/CMakeLists.txt
@@ -0,0 +1,15 @@
+FILE(GLOB HTML_FILES *.html *.css)
+FILE(GLOB GIF_FILES *.gif)
+FILE(GLOB IMAGES_FILES images/*.*)
+FILE(GLOB MMDEMOS_FILES mmdemos/*.*)
+FILE(GLOB MMINFO_FILES mminfo/*.*)
+FILE(GLOB MMTYPES_FILES mmtype/*.*)
+FILE(GLOB MORPH_FILES morph/*.*)
+
+INSTALL(FILES ${HTML_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph)
+INSTALL(FILES ${GIF_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph)
+INSTALL(FILES ${IMAGES_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph/images)
+INSTALL(FILES ${MMDEMOS_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph/mmdemos)
+INSTALL(FILES ${MMINFO_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph/mminfo)
+INSTALL(FILES ${MMTYPES_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph/mmtypes)
+INSTALL(FILES ${MORPH_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph/morph)
diff --git a/python/plugins/sextante/pymorph/scripts/CMakeLists.txt b/python/plugins/sextante/pymorph/scripts/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/scripts)
diff --git a/python/plugins/sextante/r/CMakeLists.txt b/python/plugins/sextante/r/CMakeLists.txt
@@ -0,0 +1,5 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB SCRIPT_FILES scripts/*.rsx)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/r)
+INSTALL(FILES ${SCRIPT_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/r/scripts)
diff --git a/python/plugins/sextante/saga/CMakeLists.txt b/python/plugins/sextante/saga/CMakeLists.txt
@@ -0,0 +1,7 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB DESCR_FILES description/*.txt)
+FILE(GLOB HELP_FILES help/*.html)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/saga)
+INSTALL(FILES ${DESCR_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/saga/description)
+INSTALL(FILES ${HELP_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/saga/help)
diff --git a/python/plugins/sextante/script/CMakeLists.txt b/python/plugins/sextante/script/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/script)
diff --git a/python/plugins/sextante/script/ScriptUtils.py b/python/plugins/sextante/script/ScriptUtils.py
@@ -1,4 +1,5 @@
 import os
+from sextante.core.SextanteUtils import SextanteUtils
 from sextante.core.SextanteUtils import mkdir
 from sextante.core.SextanteConfig import SextanteConfig
 
@@ -11,8 +12,8 @@ class ScriptUtils:
     def scriptsFolder():
         folder = SextanteConfig.getSetting(ScriptUtils.SCRIPTS_FOLDER)
         if folder == None:
-            folder = os.path.join(os.path.dirname(__file__), "scripts")
-            #folder = SextanteUtils.userFolder() + os.sep + "scripts"
+            #folder = os.path.join(os.path.dirname(__file__), "scripts")
+            folder = SextanteUtils.userFolder() + os.sep + "scripts"
         mkdir(folder)
 
         return folder