diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr
index 173e35e0..10a482a8 100644
--- a/Source/Cliente/FactuGES.dpr
+++ b/Source/Cliente/FactuGES.dpr
@@ -16,8 +16,7 @@ uses
   uNavPaneUtils in 'Utiles\uNavPaneUtils.pas',
   uMainMenuController in 'uMainMenuController.pas',
   uClienteUtils in 'Utiles\uClienteUtils.pas',
-  uBootStrap in 'uBootStrap.pas' {BootStrap},
-  uBootStrap2 in 'uBootStrap2.pas';
+  uBootStrap in 'uBootStrap.pas';
 
 {$R *.res}
 
@@ -31,9 +30,9 @@ begin
   // Tengo que ponerlo a false porque si no el formulario principal no se puede poner por encima de los formularios hijos.
   // Luego, en el formulario principal cambio los paramátros para obligar a que aparezca el icono en la barra de tareas.
 
-  uBootStrap2.Initialize;
-  uBootStrap2.Run;   // <- Aquí dentro esta Application.Run
-  uBootStrap2.Terminate;
+  uBootStrap.Initialize;
+  uBootStrap.Run;   // <- Aquí dentro esta Application.Run
+  uBootStrap.Terminate;
 
 
   //Application.Terminate; //<- No descomentar para así ver los Memory Leaks
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 02e152bf..3ff7f264 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -52,17 +52,6 @@
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="DebugSourceDirs">T:\Codigo (Luis Leon)\Source\Modulos\Pedidos de cliente\Controller\</Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.2.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.4</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\bin\vclhie100.bpl">Internet Explorer Hosting Support Package</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\applet100.bpl">CodeGear Control Panel Applet Package</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
@@ -82,10 +71,7 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="uAcercaDe.pas" />
-    <DCCReference Include="uBootStrap.pas">
-      <Form>BootStrap</Form>
-    </DCCReference>
-    <DCCReference Include="uBootStrap2.pas" />
+    <DCCReference Include="uBootStrap.pas" />
     <DCCReference Include="uMainMenuController.pas" />
     <DCCReference Include="uNavPaneController.pas" />
     <DCCReference Include="uPantallaPrincipal.pas">
diff --git a/Source/Cliente/FactuGES.drc b/Source/Cliente/FactuGES.drc
index 3cf7dbf9..eded6c3a 100644
--- a/Source/Cliente/FactuGES.drc
+++ b/Source/Cliente/FactuGES.drc
@@ -18,6 +18,5 @@ END
 /* C:\Codigo Tecsitel\Source\Cliente\uSplash.dfm */
 /* C:\Codigo Tecsitel\Source\Cliente\uAcercaDe.dfm */
 /* C:\Codigo Tecsitel\Source\Cliente\uPantallaPrincipal.dfm */
-/* C:\Codigo Tecsitel\Source\Cliente\uBootStrap.dfm */
 /* C:\Codigo Tecsitel\Source\Cliente\FactuGES.res */
 /* C:\Codigo Tecsitel\Source\Cliente\FactuGES.drf */
diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas
new file mode 100644
index 00000000..d138a1cb
--- /dev/null
+++ b/Source/Cliente/uBootStrap.pas
@@ -0,0 +1,75 @@
+unit uBootStrap;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, uSplash, uFactuGES_App, StdCtrls;
+
+    procedure Initialize;
+    procedure Run;
+    procedure Terminate;
+
+implementation
+
+uses
+  uDataModuleBase, uDataModuleConexion, uDataModuleConfiguracion,
+  uMainMenuController, uNavPaneController, uPantallaPrincipal;
+
+procedure DoAppLoadModules;
+begin
+  with AppFactuGES.ModuleManager do
+  begin
+    LoadModule('FormasPago_plugin.bpl');
+    LoadModule('TiposIVA_plugin.bpl');
+    LoadModule('Familias_plugin.bpl');
+    LoadModule('Contactos_plugin.bpl');
+  end;
+end;
+
+procedure DoAppMainForm;
+begin
+  Application.CreateForm(TfPantallaPrincipal, fPantallaPrincipal);
+end;
+
+procedure Initialize;
+begin
+  dmConexion := TdmConexion.Create(NIL);
+  dmConfiguracion := TdmConfiguracion.Create(NIL);
+  dmBase := TdmBase.Create(NIL);
+
+  AppFactuGES := TAppFactuGES.Create;
+  with AppFactuGES do
+  begin
+    AppSplashForm := TAppSplashForm.Create;
+    DoMainFormEvent := DoAppMainForm;
+    DoLoadModulesEvent := DoAppLoadModules;
+  end;
+
+  NavPaneController := TNavPaneController.Create;
+  MainMenuController := TMainMenuController.Create;
+end;
+
+procedure Run;
+begin
+  AppFactuGES.Run;
+  repeat
+    //Nada
+  until AppFactuGES.Terminated;
+end;
+
+procedure Terminate;
+begin
+  FreeANDNIL(MainMenuController);
+  FreeANDNIL(NavPaneController);
+
+  AppFactuGES := NIL;
+
+  FreeANDNIL(dmBase);
+  FreeANDNIL(dmConfiguracion);
+  FreeAndNil(dmConexion);
+
+  Application.ProcessMessages
+end;
+
+end.
diff --git a/Source/GUIBase/GUIBase.drc b/Source/GUIBase/GUIBase.drc
index 5dd2a2d9..c1adf14b 100644
--- a/Source/GUIBase/GUIBase.drc
+++ b/Source/GUIBase/GUIBase.drc
@@ -35,4 +35,4 @@ END
 /* C:\Codigo Tecsitel\Source\GUIBase\uDialogBase.dfm */
 /* C:\Codigo Tecsitel\Source\GUIBase\uViewGrid.dfm */
 /* C:\Codigo Tecsitel\Source\GUIBase\GUIBase.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf37.tmp */
+/* C:\Codigo Tecsitel\Source\GUIBase\GUIBase.drf */
diff --git a/Source/Modulos/Contactos/Project1.mpb b/Source/Modulos/Contactos/Project1.mpb
deleted file mode 100644
index b27cc9b3..00000000
Binary files a/Source/Modulos/Contactos/Project1.mpb and /dev/null differ