diff --git a/Sharepoint/gui/spmover/EnvSetup.ps1 b/Sharepoint/gui/spmover/EnvSetup.ps1
deleted file mode 100644
index 2735f0b..0000000
Binary files a/Sharepoint/gui/spmover/EnvSetup.ps1 and /dev/null differ
diff --git a/Sharepoint/gui/spmover/Events.ps1 b/Sharepoint/gui/spmover/Events.ps1
new file mode 100644
index 0000000..cfe172a
Binary files /dev/null and b/Sharepoint/gui/spmover/Events.ps1 differ
diff --git a/Sharepoint/gui/spmover/spmover1.ps1 b/Sharepoint/gui/spmover/spmover1.ps1
index 71cfc45..c5dcc09 100644
--- a/Sharepoint/gui/spmover/spmover1.ps1
+++ b/Sharepoint/gui/spmover/spmover1.ps1
@@ -3,8 +3,8 @@
     ===========================================================================
         FileName:  spmover1.ps1
         Author:  SebastienQUEROL
-        Created On:  2024/03/06
-        Last Updated:  2024/03/06
+        Created On:  2024/03/07
+        Last Updated:  2024/03/07
         Organization:
         Version:      v0.1
     ===========================================================================
@@ -18,31 +18,23 @@
 $sbGUI = {
     param($BaseDir)
 
-    #region Child Forms
+    #region Environment Setup
 
-    $Script:childFormInfo = @{
-        'MainForm' = @{
-            XMLText = @"
-  <Form Name="MainForm" Size="547, 462">
-    <TextBox Name="tbx_SiteURL" CharacterCasing="Lower" Location="44, 133" Size="374, 20" Text="adresse du site" />
-    <TextBox Name="tbx_SourceFolderURL" Location="43, 158" Size="169, 20" Text="Dossier source" />
-    <TextBox Name="tbx_TargetFolderURL" Location="255, 158" Size="165, 20" Text="Dossier de destination" />
-    <Button Name="btn_Start" Location="437, 134" Size="59, 43" Text="GO !" />
-    <Label Name="lbl_byWho" Font="Comic Sans MS, 0.9" Location="40, 86" Text="by squerol" />
-    <Label Name="lbl_arrow" Font="Wingdings, 1.5" Location="211, 151" Size="43, 32" Text="F" />
-    <ListBox Name="lbx_results" Font="Lucida Console, 0.8" HorizontalScrollbar="True" ItemHeight="15" Location="45, 207" ScrollAlwaysVisible="True" Size="448, 184" />
-  </Form>
-"@
-    }
-    }
-    #endregion Child Forms
+    try {
+        Add-Type -AssemblyName System.Windows.Forms
+        Add-Type -AssemblyName System.Drawing
+
+
+    } catch {Update-ErrorLog -ErrorRecord $_ -Message "Exception encountered during Environment Setup."}
+
+    #endregion Environment Setup
 
     #region Dot Sourcing of files
 
     $dotSourceDir = $BaseDir
 
     . "$($dotSourceDir)\Functions.ps1"
-    . "$($dotSourceDir)\EnvSetup.ps1"
+    . "$($dotSourceDir)\Events.ps1"
 
     #endregion Dot Sourcing of files
 
@@ -55,15 +47,24 @@ $sbGUI = {
     <TextBox Name="tbx_SourceFolderURL" Location="43, 158" Size="169, 20" Text="Dossier source" />
     <TextBox Name="tbx_TargetFolderURL" Location="255, 158" Size="165, 20" Text="Dossier de destination" />
     <Button Name="btn_Start" Location="437, 134" Size="59, 43" Text="GO !" />
-    <Label Name="lbl_byWho" Font="Comic Sans MS, 0.8" Location="40, 86" Text="by squerol" />
-    <Label Name="lbl_arrow" Font="Wingdings, 1.5" Location="211, 151" Size="43, 32" Text="F" />
-    <ListBox Name="lbx_results" Font="Lucida Console, 0.8" HorizontalScrollbar="True" ItemHeight="15" Location="45, 207" ScrollAlwaysVisible="True" Size="448, 184" />
+    <Label Name="lbl_byWho" Font="Comic Sans MS, 12pt" Location="40, 86" Text="by squerol" />
+    <Label Name="lbl_arrow" Font="Wingdings, 26.25pt" Location="211, 151" Size="43, 32" Text="F" />
+    <ListBox Name="lbx_results" Font="Lucida Console, 11.25pt" HorizontalScrollbar="True" ItemHeight="15" Location="45, 207" ScrollAlwaysVisible="True" Size="448, 184" />
+    <PictureBox Name="pbx_logo" Image="System.Drawing.Bitmap" Location="41, 18" Size="465, 69" />
   </Form>
 "@
     } catch {Update-ErrorLog -ErrorRecord $_ -Message "Exception encountered during Form Initialization."}
 
     #endregion Form Initialization
 
+    #region Event Assignment
+
+    try {
+        $Script:refs['btn_Start'].Add_Click($eventSB['btn_Start'].Click)
+    } catch {Update-ErrorLog -ErrorRecord $_ -Message "Exception encountered during Event Assignment."}
+
+    #endregion Event Assignment
+
     #region Other Actions Before ShowDialog
 
     try {
@@ -121,12 +122,3 @@ $rsGUI.Dispose()
 Exit
 
 #endregion Start Point of Execution
-
-
-
-$btn_Start.Add_Click({
-
-        connectSP($tbx_SiteURL.Text)
-        moveSP($tbx_SourceFolderURL.Text,$tbx_TargetFolderURL.Text)
-
-    })
\ No newline at end of file