Index: tol_pkg/_install_tools.tol
===================================================================
--- tol_pkg/_install_tools.tol	(revision eaa41f75291d268bdf365eb5234f6a76f6a6a918)
+++ tol_pkg/_install_tools.tol	(revision eaa41f75291d268bdf365eb5234f6a76f6a6a918)
@@ -0,0 +1,31 @@
+//////////////////////////////////////////////////////////////////////////////
+// FILE    : _install_tools.tol
+// PURPOSE : Tol Package installation tools
+//////////////////////////////////////////////////////////////////////////////
+
+Text version = Replace(Tokenizer(Version," ")[1],".","_");
+Text tolpkg_install = Replace(TolAppDataPath+
+  "OIS/Require/tol_pkg/"+version+"/","\\","/");
+
+Real OSCmdWaitWr(Text order)
+{
+  WriteLn(order);
+  Real OSCmdWait(order)
+};
+
+Set packages = 
+[[
+  "HashMap",
+  "MatQuery",
+  "MatEncode",
+  "FunRn2R",
+  "MulVarFunAprox",
+  "MhCnstrLinRegArima",
+  "GraphTools",
+  "GisTools" 
+]];
+
+Real OSDirRemove(tolpkg_install);
+Real OSDirMake(tolpkg_install);
+
+/* */
Index: tol_pkg/_local_install.bat
===================================================================
--- tol_pkg/_local_install.bat	(revision eaa41f75291d268bdf365eb5234f6a76f6a6a918)
+++ tol_pkg/_local_install.bat	(revision eaa41f75291d268bdf365eb5234f6a76f6a6a918)
@@ -0,0 +1,2 @@
+..\windows\ActiveTol\bin\tol -v _local_install.tol
+pause
Index: tol_pkg/_local_install.tol
===================================================================
--- tol_pkg/_local_install.tol	(revision eaa41f75291d268bdf365eb5234f6a76f6a6a918)
+++ tol_pkg/_local_install.tol	(revision eaa41f75291d268bdf365eb5234f6a76f6a6a918)
@@ -0,0 +1,19 @@
+//////////////////////////////////////////////////////////////////////////////
+// FILE    : uploader.tol
+// PURPOSE : call all prepared tests about TOL features checking are binding 
+// to decide if a version should be published or not.
+//////////////////////////////////////////////////////////////////////////////
+
+Set Include("_install_tools.tol");
+
+Real OSDirRemove(tolpkg_install);
+Real OSDirMake(tolpkg_install);
+  
+Set EvalSet(packages, Real(Text name)
+{
+  Set aux = {[[Include(name+"/"+name+".tol")]]};
+  Real Ois.Store(aux[1],tolpkg_install+name+".oza")
+});
+
+
+/* */
Index: tol_pkg/_uploader.tol
===================================================================
--- tol_pkg/_uploader.tol	(revision db5353817df8f36d24a5a99918b4a59c88f21912)
+++ tol_pkg/_uploader.tol	(revision eaa41f75291d268bdf365eb5234f6a76f6a6a918)
@@ -5,4 +5,6 @@
 //////////////////////////////////////////////////////////////////////////////
 
+Set Include("_install_tools.tol");
+
 //Text compress = "\"c:\Archivos de programa\7-Zip\7z.exe\" a -r -tzip ";
 Text compress = " ";
@@ -10,49 +12,13 @@
 Text local = ".";
 Text export = tolpkg+"export";
-Text version = Replace(Tokenizer(Version," ")[1],".","_");
 Text upload = tolpkg+"tol_pkg/"+version;
-Text tolpkg_install = Replace(TolAppDataPath+
-  "OIS/Require/tol_pkg/"+version+"/","\\","/");
 
-Real OSDirRemove(tolpkg_install);
-Real OSDirMake(tolpkg_install);
 Real OSDirRemove(tolpkg);
 Real OSDirMake(tolpkg);
 Real OSDirMake(upload);
 
-Real OSCmdWaitWr(Text order)
-{
-  WriteLn(order);
-  Real OSCmdWait(order)
-};
-
 Real OSCmdWaitWr("svn export --force "
   "https://www.tol-project.org/svn/tolp/trunk/tol_pkg \""+export+"\"");
-
-
-Set packages = 
-[[
-  "HashMap",
-  "MatQuery",
-  "MatEncode",
-  "MulVarFunAprox",
-  "MhCnstrLinRegArima",
-  "GraphTools",
-  "GisTools"
-]];
-/*
-{
-  Set aux = Select(GetDir(export)[2], Real(Text subDir)
-  {
-    Real fst = ASCII(Sub(subDir,1,1)); 
-    If(!LE(ASCII("A"),fst,ASCII("Z")),False,
-    {
-      FileExist(subDir+"/"+subDir+".tol")
-    })
-  });
-  Sort(aux,Real(Text a, Text b) { Compare(a,b) })
-};
-*/
-  
+ 
 Text SetOfTextToWikiList(Set set, Text margin, Text quote)
 {
@@ -94,9 +60,10 @@
 ");
   Real Ois.Store(aux[1],upl+".oza");
-  Real OSCmdWaitWr("cp "+upl+".oza \""+ReplaceSlash(tolpkg_install)+"\"");
+  Real OSCmdWaitWr("cp \""+upl+".oza\" \""+ReplaceSlash(tolpkg_install)+"\"");
   Real OSCmdWaitWr("\""+tolpkg+"compress.bat\" "+name)
 });
 
 Real FClose(wiki);
+
 
 Text remoteUser =