diff --git a/GIM_site/ExcelExportAllData.aspx.cs b/GIM_site/ExcelExportAllData.aspx.cs
index b74570d..291a1ee 100644
--- a/GIM_site/ExcelExportAllData.aspx.cs
+++ b/GIM_site/ExcelExportAllData.aspx.cs
@@ -5,7 +5,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using SteamWare;
-using GIM_data;
+using GIM_dataLayer;
 using System.Text;
 using System.Data;
 
diff --git a/GIM_site/ExcelExportMtzPrev.aspx b/GIM_site/ExcelExportMtzPrev.aspx
index f54c79a..2e1f233 100644
--- a/GIM_site/ExcelExportMtzPrev.aspx
+++ b/GIM_site/ExcelExportMtzPrev.aspx
@@ -56,7 +56,7 @@
                 </Columns>
             </asp:GridView>
             <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
-                SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.v_mtzProgExpTableAdapter"
+                SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.v_mtzProgExpTableAdapter"
                 FilterExpression=" codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR descrizione LIKE '%{0}%' ">
                 <FilterParameters>
                     <asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
diff --git a/GIM_site/ExcelExportMtzPrevPending.aspx b/GIM_site/ExcelExportMtzPrevPending.aspx
index 9ba0891..4b8db98 100644
--- a/GIM_site/ExcelExportMtzPrevPending.aspx
+++ b/GIM_site/ExcelExportMtzPrevPending.aspx
@@ -28,7 +28,7 @@
                 <asp:BoundField DataField="descrTipo" HeaderText="descrTipo" SortExpression="descrTipo" />
             </Columns>
         </asp:GridView>
-        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getBySearch" TypeName="GIM_data.DS_utilityTableAdapters.v_mtzProgPendingExpTableAdapter" OldValuesParameterFormatString="original_{0}">
+        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getBySearch" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_mtzProgPendingExpTableAdapter" OldValuesParameterFormatString="original_{0}">
         <SelectParameters>
             <asp:SessionParameter DefaultValue="%" Name="ricerca" SessionField="valoreCercato" Type="String" />
             <asp:SessionParameter DefaultValue="0" Name="idxTipo" SessionField="idxTipo_filt" Type="Int32" />
diff --git a/GIM_site/ExcelExportReportIntAll.aspx b/GIM_site/ExcelExportReportIntAll.aspx
index 65e0ff9..ef19bb4 100644
--- a/GIM_site/ExcelExportReportIntAll.aspx
+++ b/GIM_site/ExcelExportReportIntAll.aspx
@@ -47,7 +47,7 @@
                 </Columns>
             </asp:GridView>
             <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
-                SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.ElencoIntervExtTableAdapter">
+                SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.ElencoIntervExtTableAdapter">
                 <SelectParameters>
                     <asp:SessionParameter Name="inizio" SessionField="_inizio" Type="DateTime" />
                     <asp:SessionParameter Name="fine" SessionField="_fine" Type="DateTime" />
diff --git a/GIM_site/GIM_site.csproj b/GIM_site/GIM_site.csproj
index 14b76ac..b928ae7 100644
--- a/GIM_site/GIM_site.csproj
+++ b/GIM_site/GIM_site.csproj
@@ -1822,9 +1822,9 @@
       <Project>{2872dcfe-8b46-43b2-baa0-842a816a2dd5}</Project>
       <Name>SteamWare</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GIM_data\GIM_data.csproj">
-      <Project>{f66427c8-882a-4ef8-b42f-ef142906dc8c}</Project>
-      <Name>GIM_data</Name>
+    <ProjectReference Include="..\GIM_dataLayer\GIM_dataLayer.csproj">
+      <Project>{b430e135-72ec-49d1-9c82-274294cf2f80}</Project>
+      <Name>GIM_dataLayer</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/GIM_site/Properties/PublishProfiles/Alumat_Winlab.pubxml b/GIM_site/Properties/PublishProfiles/Alumat_Winlab.pubxml
index c02e8df..178d4e4 100644
--- a/GIM_site/Properties/PublishProfiles/Alumat_Winlab.pubxml
+++ b/GIM_site/Properties/PublishProfiles/Alumat_Winlab.pubxml
@@ -31,11 +31,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt
             <Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
           </UpdateFrom>
         </ObjectGroup>
-        <ObjectGroup Name="GIM_Data.Properties.Settings.GIMConnectionString" Order="2" Enabled="True">
+        <ObjectGroup Name="GIM_dataLayer.Properties.Settings.GIMConnectionString" Order="2" Enabled="True">
           <Destination Path="Data Source=localhost\SQLExpress2008R2;Initial Catalog=Alumat_WebGIM;Persist Security Info=True;User ID=sa;Password=keyhammer" />
           <Object Type="DbDacFx">
             <PreSource Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
-            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
+            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_dataLayer.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
             <Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
@@ -53,7 +53,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <ParameterValue>Data Source=localhost\SQLExpress2008R2;Initial Catalog=Alumat_WebGIM;Persist Security Info=True;User ID=sa;Password=keyhammer</ParameterValue>
       <UpdateDestWebConfig>False</UpdateDestWebConfig>
     </MSDeployParameterValue>
-    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_Data.Properties.Settings.GIMConnectionString-Web.config Connection String">
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_dataLayer.Properties.Settings.GIMConnectionString-Web.config Connection String">
       <ParameterValue>Data Source=localhost\SQLExpress2008R2;Initial Catalog=Alumat_WebGIM;Persist Security Info=True;User ID=sa;Password=keyhammer</ParameterValue>
       <UpdateDestWebConfig>False</UpdateDestWebConfig>
     </MSDeployParameterValue>
diff --git a/GIM_site/Properties/PublishProfiles/IIS01.pubxml b/GIM_site/Properties/PublishProfiles/IIS01.pubxml
index a023ac7..ea18447 100644
--- a/GIM_site/Properties/PublishProfiles/IIS01.pubxml
+++ b/GIM_site/Properties/PublishProfiles/IIS01.pubxml
@@ -21,11 +21,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <_SavePWD>True</_SavePWD>
     <PublishDatabaseSettings>
       <Objects xmlns="">
-        <ObjectGroup Name="GIM_Data.Properties.Settings.GIMConnectionString" Order="1" Enabled="False">
+        <ObjectGroup Name="GIM_dataLayer.Properties.Settings.GIMConnectionString" Order="1" Enabled="False">
           <Destination Path="" />
           <Object Type="DbDacFx">
             <PreSource Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
-            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
+            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_dataLayer.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
             <Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
@@ -53,7 +53,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <MSDeployParameterValue Include="$(DeployParameterPrefix)GIMConnectionString-Web.config Connection String">
       <UpdateDestWebConfig>False</UpdateDestWebConfig>
     </MSDeployParameterValue>
-    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_Data.Properties.Settings.GIMConnectionString-Web.config Connection String">
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_dataLayer.Properties.Settings.GIMConnectionString-Web.config Connection String">
       <UpdateDestWebConfig>False</UpdateDestWebConfig>
     </MSDeployParameterValue>
   </ItemGroup>
diff --git a/GIM_site/Properties/PublishProfiles/IIS02.pubxml b/GIM_site/Properties/PublishProfiles/IIS02.pubxml
index 975d0d0..6587659 100644
--- a/GIM_site/Properties/PublishProfiles/IIS02.pubxml
+++ b/GIM_site/Properties/PublishProfiles/IIS02.pubxml
@@ -21,11 +21,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <_SavePWD>True</_SavePWD>
     <PublishDatabaseSettings>
       <Objects xmlns="">
-        <ObjectGroup Name="GIM_Data.Properties.Settings.GIMConnectionString" Order="1" Enabled="False">
+        <ObjectGroup Name="GIM_dataLayer.Properties.Settings.GIMConnectionString" Order="1" Enabled="False">
           <Destination Path="" />
           <Object Type="DbDacFx">
             <PreSource Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
-            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
+            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_dataLayer.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
             <Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
@@ -53,7 +53,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <MSDeployParameterValue Include="$(DeployParameterPrefix)GIMConnectionString-Web.config Connection String">
       <UpdateDestWebConfig>False</UpdateDestWebConfig>
     </MSDeployParameterValue>
-    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_Data.Properties.Settings.GIMConnectionString-Web.config Connection String">
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_dataLayer.Properties.Settings.GIMConnectionString-Web.config Connection String">
       <UpdateDestWebConfig>False</UpdateDestWebConfig>
     </MSDeployParameterValue>
   </ItemGroup>
diff --git a/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml b/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml
index fa17b93..64bdea6 100644
--- a/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml
+++ b/GIM_site/Properties/PublishProfiles/Somaschini-ITA.pubxml
@@ -26,11 +26,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt
             <Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
           </UpdateFrom>
         </ObjectGroup>
-        <ObjectGroup Name="GIM_Data.Properties.Settings.GIMConnectionString" Order="2" Enabled="False">
+        <ObjectGroup Name="GIM_dataLayer.Properties.Settings.GIMConnectionString" Order="2" Enabled="False">
           <Destination Path="Data Source=localhost;Initial Catalog=GIM;Persist Security Info=True;User ID=steamware;Password=viadante16" />
           <Object Type="DbDacFx">
             <PreSource Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
-            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
+            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_dataLayer.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
             <Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
@@ -47,7 +47,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <MSDeployParameterValue Include="$(DeployParameterPrefix)GIMConnectionString-Web.config Connection String">
       <ParameterValue>Data Source=localhost;Initial Catalog=GIM;Persist Security Info=True;User ID=steamware;Password=viadante16</ParameterValue>
     </MSDeployParameterValue>
-    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_Data.Properties.Settings.GIMConnectionString-Web.config Connection String">
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_dataLayer.Properties.Settings.GIMConnectionString-Web.config Connection String">
       <ParameterValue>Data Source=localhost;Initial Catalog=GIM;Persist Security Info=True;User ID=steamware;Password=viadante16</ParameterValue>
     </MSDeployParameterValue>
   </ItemGroup>
diff --git a/GIM_site/Properties/PublishProfiles/Somaschini-USA.pubxml b/GIM_site/Properties/PublishProfiles/Somaschini-USA.pubxml
index d193063..0b6bd7c 100644
--- a/GIM_site/Properties/PublishProfiles/Somaschini-USA.pubxml
+++ b/GIM_site/Properties/PublishProfiles/Somaschini-USA.pubxml
@@ -26,11 +26,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt
             <Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
           </UpdateFrom>
         </ObjectGroup>
-        <ObjectGroup Name="GIM_Data.Properties.Settings.GIMConnectionString" Order="2" Enabled="False">
+        <ObjectGroup Name="GIM_dataLayer.Properties.Settings.GIMConnectionString" Order="2" Enabled="False">
           <Destination Path="" />
           <Object Type="DbDacFx">
             <PreSource Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
-            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
+            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_dataLayer.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
             <Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
@@ -41,6 +41,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   </PropertyGroup>
   <ItemGroup>
     <MSDeployParameterValue Include="$(DeployParameterPrefix)GIMConnectionString-Web.config Connection String" />
-    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_Data.Properties.Settings.GIMConnectionString-Web.config Connection String" />
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_dataLayer.Properties.Settings.GIMConnectionString-Web.config Connection String" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/GIM_site/Properties/PublishProfiles/WinLab.pubxml b/GIM_site/Properties/PublishProfiles/WinLab.pubxml
index 3c120a3..f6b9b25 100644
--- a/GIM_site/Properties/PublishProfiles/WinLab.pubxml
+++ b/GIM_site/Properties/PublishProfiles/WinLab.pubxml
@@ -31,11 +31,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt
             <Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
           </UpdateFrom>
         </ObjectGroup>
-        <ObjectGroup Name="GIM_Data.Properties.Settings.GIMConnectionString" Order="2" Enabled="True">
+        <ObjectGroup Name="GIM_dataLayer.Properties.Settings.GIMConnectionString" Order="2" Enabled="True">
           <Destination Path="Data Source=localhost\SQLExpress2008R2;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" />
           <Object Type="DbDacFx">
             <PreSource Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
-            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_Data.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
+            <Source Path="$(IntermediateOutputPath)AutoScripts\GIM_dataLayer.Properties.Settings.GIMConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
           </Object>
           <UpdateFrom Type="Web.Config">
             <Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
@@ -49,7 +49,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
       <ParameterValue>Data Source=localhost\SQLExpress2008R2;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer</ParameterValue>
       <UpdateDestWebConfig>False</UpdateDestWebConfig>
     </MSDeployParameterValue>
-    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_Data.Properties.Settings.GIMConnectionString-Web.config Connection String">
+    <MSDeployParameterValue Include="$(DeployParameterPrefix)GIM_dataLayer.Properties.Settings.GIMConnectionString-Web.config Connection String">
       <ParameterValue>Data Source=localhost\SQLExpress2008R2;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer</ParameterValue>
       <UpdateDestWebConfig>False</UpdateDestWebConfig>
     </MSDeployParameterValue>
diff --git a/GIM_site/RegConsumoRic.aspx b/GIM_site/RegConsumoRic.aspx
index 8de7bea..142b556 100644
--- a/GIM_site/RegConsumoRic.aspx
+++ b/GIM_site/RegConsumoRic.aspx
@@ -24,7 +24,7 @@
                             <div class="col-xs-12">
                                 <asp:Label runat="server" ID="lblImpianto"><%: traduci("lblImpianto") %></asp:Label><br />
                                 <asp:DropDownList runat="server" CssClass="textEv_1" ID="ddlImpianto" DataSourceID="odsImpianti" DataTextField="label" DataValueField="value" OnSelectedIndexChanged="ddlImpianto_SelectedIndexChanged" AutoPostBack="True" Width="100%"></asp:DropDownList>
-                                <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
+                                <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
                             </div>
                         </div>
                         <div class="row">
@@ -32,7 +32,7 @@
                                 <asp:Label runat="server" ID="lblMacchina"><%: traduci("lblMacchina") %></asp:Label><br />
                                 <asp:DropDownList runat="server" CssClass="textEv_1" ID="ddlMacchine" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" Width="100%" AutoPostBack="True" OnSelectedIndexChanged="ddlMacchine_SelectedIndexChanged"></asp:DropDownList>
                                 <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}"
-                                    SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter">
+                                    SelectMethod="getByConditio" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter">
                                     <SelectParameters>
                                         <asp:ControlParameter ControlID="ddlImpianto" DefaultValue="0" Name="conditio" PropertyName="SelectedValue" Type="Int32" />
                                     </SelectParameters>
@@ -44,7 +44,7 @@
                                 <asp:Label runat="server" ID="lblCausale"><%: traduci("lblCausale") %></asp:Label><br />
                                 <asp:DropDownList runat="server" CssClass="textEv_1" ID="ddlCausale" DataSourceID="odsCausali" DataTextField="label" DataValueField="value" Width="100%"></asp:DropDownList>
                                 <asp:ObjectDataSource ID="odsCausali" runat="server" OldValuesParameterFormatString="original_{0}"
-                                    SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter">
+                                    SelectMethod="getByConditio" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter">
                                     <SelectParameters>
                                         <asp:ControlParameter ControlID="ddlMacchine" DefaultValue="0" Name="conditio" PropertyName="SelectedValue" Type="Int32" />
                                     </SelectParameters>
@@ -60,12 +60,12 @@
                             <div class="col-xs-4">
                                 <asp:Label runat="server" ID="lblDescrTipo"><%: traduci("lblDescrTipo") %></asp:Label><br />
                                 <asp:DropDownList runat="server" ID="ddlTipo" Font-Bold="True" Font-Size="9pt" DataSourceID="odsTipo" DataTextField="label" DataValueField="value" />
-                                <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
+                                <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
                             </div>
                             <div class="col-xs-4">
                                 <asp:Label runat="server" ID="lblDescrPriorita"><%: traduci("lblDescrPriorita") %></asp:Label><br />
                                 <asp:DropDownList runat="server" ID="ddlPrior" Font-Bold="True" Font-Size="8pt" DataSourceID="odsPrior" DataTextField="label" DataValueField="value" />
-                                <asp:ObjectDataSource ID="odsPrior" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selPriorTableAdapter"></asp:ObjectDataSource>
+                                <asp:ObjectDataSource ID="odsPrior" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selPriorTableAdapter"></asp:ObjectDataSource>
                             </div>
                             <div class="col-xs-2">
                                 <asp:Label runat="server" ID="lblIsFermo"><%: traduci("lblIsFermo") %></asp:Label><br />
diff --git a/GIM_site/Web.Alumat.config b/GIM_site/Web.Alumat.config
index 6d3936e..d31c108 100644
--- a/GIM_site/Web.Alumat.config
+++ b/GIM_site/Web.Alumat.config
@@ -24,7 +24,7 @@
   </appSettings>
   <connectionStrings>
     <add name="GIMConnectionString" connectionString="Data Source=localhost\SQLExpress2008R2;Initial Catalog=Alumat_WebGIM;Persist Security Info=True;User ID=sa;Password=keyhammer" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
-    <add name="GIM_Data.Properties.Settings.GIMConnectionString" connectionString="Data Source=localhost\SQLExpress2008R2;Initial Catalog=Alumat_WebGIM;Persist Security Info=True;User ID=sa;Password=keyhammer" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
+    <add name="GIM_dataLayer.Properties.Settings.GIMConnectionString" connectionString="Data Source=localhost\SQLExpress2008R2;Initial Catalog=Alumat_WebGIM;Persist Security Info=True;User ID=sa;Password=keyhammer" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
   </connectionStrings>
   <system.web>
     <compilation xdt:Transform="RemoveAttributes(debug)" />
diff --git a/GIM_site/Web.IIS01.config b/GIM_site/Web.IIS01.config
index f1b73f6..93649ae 100644
--- a/GIM_site/Web.IIS01.config
+++ b/GIM_site/Web.IIS01.config
@@ -14,7 +14,7 @@
   </appSettings>
   <connectionStrings>
     <add name="GIMConnectionString" connectionString="Data Source=Win2012-SQL;Initial Catalog=Somaschini_GIM_ITA_prod;Persist Security Info=True;User id=sa;Password=keyhammer;" xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    <add name="GIM_Data.Properties.Settings.GIMConnectionString" connectionString="Data Source=Win2012-SQL;Initial Catalog=Somaschini_GIM_ITA_prod;Persist Security Info=True;User id=sa;Password=keyhammer;" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
+    <add name="GIM_dataLayer.Properties.Settings.GIMConnectionString" connectionString="Data Source=Win2012-SQL;Initial Catalog=Somaschini_GIM_ITA_prod;Persist Security Info=True;User id=sa;Password=keyhammer;" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
   </connectionStrings>
   <system.web>
     <compilation xdt:Transform="RemoveAttributes(debug)" />
diff --git a/GIM_site/Web.OVH.config b/GIM_site/Web.OVH.config
index 9927cc5..ee20986 100644
--- a/GIM_site/Web.OVH.config
+++ b/GIM_site/Web.OVH.config
@@ -26,7 +26,7 @@
   </appSettings>
   <connectionStrings>
     <add name="GIMConnectionString" connectionString="Data Source=localhost\SQLExpress2008R2;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    <add name="GIM_Data.Properties.Settings.GIMConnectionString" connectionString="Data Source=localhost\SQLExpress2008R2;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
+    <add name="GIM_dataLayer.Properties.Settings.GIMConnectionString" connectionString="Data Source=localhost\SQLExpress2008R2;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
   </connectionStrings>
   <system.web>
     <compilation xdt:Transform="RemoveAttributes(debug)" />
diff --git a/GIM_site/Web.Somaschini.config b/GIM_site/Web.Somaschini.config
index 02889b0..01c0071 100644
--- a/GIM_site/Web.Somaschini.config
+++ b/GIM_site/Web.Somaschini.config
@@ -21,7 +21,7 @@
   </appSettings>
   <connectionStrings>
     <add name="GIMConnectionString" connectionString="Data Source=localhost;Initial Catalog=GIM;Persist Security Info=True;User ID=steamware;Password=viadante16" xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    <add name="GIM_Data.Properties.Settings.GIMConnectionString" connectionString="Data Source=localhost;Initial Catalog=GIM;Persist Security Info=True;User ID=steamware;Password=viadante16" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
+    <add name="GIM_dataLayer.Properties.Settings.GIMConnectionString" connectionString="Data Source=localhost;Initial Catalog=GIM;Persist Security Info=True;User ID=steamware;Password=viadante16" xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
   </connectionStrings>
   <system.web>
     <compilation xdt:Transform="RemoveAttributes(debug)" />
diff --git a/GIM_site/Web.config b/GIM_site/Web.config
index 36fe096..c0a8187 100644
--- a/GIM_site/Web.config
+++ b/GIM_site/Web.config
@@ -201,7 +201,7 @@
   </appSettings>
   <connectionStrings>
     <add name="GIMConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer;" providerName="System.Data.SqlClient" />
-    <add name="GIM_Data.Properties.Settings.GIMConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer;" providerName="System.Data.SqlClient" />
+    <add name="GIM_dataLayer.Properties.Settings.GIMConnectionString" connectionString="Data Source=SQL-STEAM\SQL2012;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer;" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
diff --git a/GIM_site/WebUserControls/mod_MovMag2Int.ascx b/GIM_site/WebUserControls/mod_MovMag2Int.ascx
index bf7c2d3..bf706d9 100644
--- a/GIM_site/WebUserControls/mod_MovMag2Int.ascx
+++ b/GIM_site/WebUserControls/mod_MovMag2Int.ascx
@@ -94,7 +94,7 @@
         </asp:TemplateField>
     </Columns>
 </asp:GridView>
-<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByNumInt" TypeName="GIM_data.DS_MagTableAdapters.MovMagRicTableAdapter" DeleteMethod="deleteQuery" UpdateMethod="updateQuery">
+<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByNumInt" TypeName="GIM_dataLayer.DS_MagTableAdapters.MovMagRicTableAdapter" DeleteMethod="deleteQuery" UpdateMethod="updateQuery">
     <DeleteParameters>
         <asp:Parameter Name="Original_idxItem" Type="Int32" />
         <asp:Parameter Name="Original_numIntMtz" Type="Int32" />
diff --git a/GIM_site/WebUserControls/mod_SinonimiTag.ascx b/GIM_site/WebUserControls/mod_SinonimiTag.ascx
index 07984fa..8e23323 100644
--- a/GIM_site/WebUserControls/mod_SinonimiTag.ascx
+++ b/GIM_site/WebUserControls/mod_SinonimiTag.ascx
@@ -68,7 +68,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_MagTableAdapters.SinonimiTagTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_MagTableAdapters.SinonimiTagTableAdapter"
     UpdateMethod="updateQuery" OldValuesParameterFormatString="Original_{0}"
     FilterExpression="TagCode LIKE '%{0}%' OR TagCodeOrig LIKE '%{0}%' ">
     <UpdateParameters>
@@ -80,5 +80,5 @@
     </FilterParameters>
 </asp:ObjectDataSource>
 
-<asp:ObjectDataSource runat="server" ID="odsTags" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_MagTableAdapters.AnagTagsTableAdapter">
+<asp:ObjectDataSource runat="server" ID="odsTags" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_MagTableAdapters.AnagTagsTableAdapter">
 </asp:ObjectDataSource>
\ No newline at end of file
diff --git a/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx b/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx
index 9c3746f..854028f 100644
--- a/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx
+++ b/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx
@@ -61,7 +61,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagAmbitoGuastoTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.AnagAmbitoGuastoTableAdapter"
     UpdateMethod="Update" DeleteMethod="DeleteQuery" OldValuesParameterFormatString="Original_{0}"
     FilterExpression="descrAmbitoGuasto LIKE '%{0}%' " InsertMethod="Insert">
     <UpdateParameters>
diff --git a/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx.cs b/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx.cs
index d162ea2..c30b57a 100644
--- a/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx.cs
+++ b/GIM_site/WebUserControls/mod_anagAmbitiGuasto.ascx.cs
@@ -78,7 +78,7 @@ public partial class mod_anagAmbitiGuasto : ApplicationUserControl
         // reset selezione...
         resetSelezione();
         // i primi valori ("0") di default sono "ND"... li inserisco come standard...
-        GIM_data.DS_applicazioneTableAdapters.AnagAmbitoGuastoTableAdapter taAnagAmbito = new GIM_data.DS_applicazioneTableAdapters.AnagAmbitoGuastoTableAdapter();
+        GIM_dataLayer.DS_applicazioneTableAdapters.AnagAmbitoGuastoTableAdapter taAnagAmbito = new GIM_dataLayer.DS_applicazioneTableAdapters.AnagAmbitoGuastoTableAdapter();
         taAnagAmbito.Insert(memLayer.ML.confReadString("newAmbitoGuasto"));
         grView.DataBind();
     }
diff --git a/GIM_site/WebUserControls/mod_anagLocazioni.ascx b/GIM_site/WebUserControls/mod_anagLocazioni.ascx
index 36b0356..e6d7b35 100644
--- a/GIM_site/WebUserControls/mod_anagLocazioni.ascx
+++ b/GIM_site/WebUserControls/mod_anagLocazioni.ascx
@@ -55,7 +55,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_MagTableAdapters.AnagLocazioniTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_MagTableAdapters.AnagLocazioniTableAdapter"
     UpdateMethod="updateQuery" DeleteMethod="deleteQuery" OldValuesParameterFormatString="original_{0}"
     FilterExpression="CodLocazione LIKE '%{0}%' OR Descrizione LIKE '%{0}%' " InsertMethod="insertQuery">
     <UpdateParameters>
diff --git a/GIM_site/WebUserControls/mod_anagOpMtz.ascx b/GIM_site/WebUserControls/mod_anagOpMtz.ascx
index c560a97..817ea95 100644
--- a/GIM_site/WebUserControls/mod_anagOpMtz.ascx
+++ b/GIM_site/WebUserControls/mod_anagOpMtz.ascx
@@ -78,7 +78,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagrOperMtzTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.AnagrOperMtzTableAdapter"
     UpdateMethod="Update" DeleteMethod="Delete" OldValuesParameterFormatString="original_{0}"
     FilterExpression=" (matrOp LIKE '%{0}%') OR (Cognome LIKE '%{0}%') OR (Nome LIKE '%{0}%') "
     InsertMethod="Insert">
diff --git a/GIM_site/WebUserControls/mod_anagOpMtz.ascx.cs b/GIM_site/WebUserControls/mod_anagOpMtz.ascx.cs
index bdf105f..528eda3 100644
--- a/GIM_site/WebUserControls/mod_anagOpMtz.ascx.cs
+++ b/GIM_site/WebUserControls/mod_anagOpMtz.ascx.cs
@@ -78,7 +78,7 @@ public partial class mod_anagOpMtz : ApplicationUserControl
         // reset selezione...
         resetSelezione();
         // i primi valori ("0") di default sono "ND"... li inserisco come standard...
-        GIM_data.DS_applicazioneTableAdapters.AnagrOperMtzTableAdapter taAnagOpMtz = new GIM_data.DS_applicazioneTableAdapters.AnagrOperMtzTableAdapter();
+        GIM_dataLayer.DS_applicazioneTableAdapters.AnagrOperMtzTableAdapter taAnagOpMtz = new GIM_dataLayer.DS_applicazioneTableAdapters.AnagrOperMtzTableAdapter();
         taAnagOpMtz.Insert("9999", memLayer.ML.confReadString("newCognome"), memLayer.ML.confReadString("newNome"));
         grView.DataBind();
     }
diff --git a/GIM_site/WebUserControls/mod_anagTags.ascx b/GIM_site/WebUserControls/mod_anagTags.ascx
index dbcbc5b..abaf203 100644
--- a/GIM_site/WebUserControls/mod_anagTags.ascx
+++ b/GIM_site/WebUserControls/mod_anagTags.ascx
@@ -69,7 +69,7 @@
             </Columns>
         </asp:GridView>
         <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
-        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_MagTableAdapters.AnagTagsTableAdapter" UpdateMethod="updateQuery" DeleteMethod="deleteQuery" OldValuesParameterFormatString="Original_{0}" FilterExpression="TagCode LIKE '%{0}%' OR Class LIKE '%{0}%' OR TagDescr LIKE '%{0}%' " InsertMethod="insertQuery">
+        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_MagTableAdapters.AnagTagsTableAdapter" UpdateMethod="updateQuery" DeleteMethod="deleteQuery" OldValuesParameterFormatString="Original_{0}" FilterExpression="TagCode LIKE '%{0}%' OR Class LIKE '%{0}%' OR TagDescr LIKE '%{0}%' " InsertMethod="insertQuery">
             <UpdateParameters>
                 <asp:Parameter Name="TagCode" Type="String" />
                 <asp:Parameter Name="Class" Type="String" />
diff --git a/GIM_site/WebUserControls/mod_aperturaImpianti.ascx b/GIM_site/WebUserControls/mod_aperturaImpianti.ascx
index 567fdf8..653d5ba 100644
--- a/GIM_site/WebUserControls/mod_aperturaImpianti.ascx
+++ b/GIM_site/WebUserControls/mod_aperturaImpianti.ascx
@@ -39,7 +39,7 @@
         </asp:TemplateField>
     </Columns>
 </asp:GridView>
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.OreAperturaSettTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.OreAperturaSettTableAdapter"
     UpdateMethod="updateApertura" OldValuesParameterFormatString="Original_{0}" >
     <UpdateParameters>
         <asp:Parameter Name="apertura" Type="Decimal" />
diff --git a/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx b/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx
index d48e589..8a93e57 100644
--- a/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx
+++ b/GIM_site/WebUserControls/mod_assegnazioniMacchineImpianti.ascx
@@ -38,5 +38,5 @@
     </tr>
 </table>
 <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
-    SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
+    SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
 <asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
\ No newline at end of file
diff --git a/GIM_site/WebUserControls/mod_calChiusura.ascx b/GIM_site/WebUserControls/mod_calChiusura.ascx
index 5f06687..7906956 100644
--- a/GIM_site/WebUserControls/mod_calChiusura.ascx
+++ b/GIM_site/WebUserControls/mod_calChiusura.ascx
@@ -68,7 +68,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.CalendFesteFerieTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.CalendFesteFerieTableAdapter"
     UpdateMethod="Update" DeleteMethod="Delete" OldValuesParameterFormatString="Original_{0}"
     FilterExpression="descrizione LIKE '%{0}%' " InsertMethod="Insert">
     <UpdateParameters>
diff --git a/GIM_site/WebUserControls/mod_dettInt_default.ascx b/GIM_site/WebUserControls/mod_dettInt_default.ascx
index 658c64b..f918115 100644
--- a/GIM_site/WebUserControls/mod_dettInt_default.ascx
+++ b/GIM_site/WebUserControls/mod_dettInt_default.ascx
@@ -60,7 +60,7 @@
                                 <br />
                                 <asp:DropDownList ID="listImpianti" runat="server" DataSourceID="odsImpianti" DataTextField="label" DataValueField="value" AutoPostBack="true" Width="100%" BackColor="Silver" Font-Size="8pt" SelectedValue='<%# Eval("idxImpianto") %>' Enabled="false">
                                 </asp:DropDownList>
-                                <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
+                                <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
                             </div>
                         </div>
                         <div class="row">
@@ -75,7 +75,7 @@
                                 <br />
                                 <asp:DropDownList ID="listMacchine" runat="server" AutoPostBack="True" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" Width="100%" BackColor="Silver" Font-Size="8pt" SelectedValue='<%# Eval("idxMacchina") %>' Enabled="false">
                                 </asp:DropDownList>
-                                <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
+                                <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
                             </div>
                         </div>
                         <div class="row" style="padding-top: 0.5em;">
@@ -151,7 +151,7 @@
                                 <br />
                                 <asp:DropDownList runat="server" ID="ddlStato" CssClass="fixedVal" SelectedValue='<%# Eval("idxStato") %>' DataSourceID="odsStato" DataTextField="label" DataValueField="value" Enabled="false">
                                 </asp:DropDownList>
-                                <asp:ObjectDataSource ID="odsStato" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selStatoTableAdapter"></asp:ObjectDataSource>
+                                <asp:ObjectDataSource ID="odsStato" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selStatoTableAdapter"></asp:ObjectDataSource>
                             </div>
                             <div class="col-sm-3">
                                 <asp:Label runat="server" ID="lblInterventi" Text='<%# traduci ("lblInterventi") %>'
@@ -231,7 +231,7 @@
                             <br />
                             <asp:DropDownList ID="listImpianti" runat="server" DataSourceID="odsImpianti" DataTextField="label" DataValueField="value" Width="100%" BackColor="Silver" Font-Size="8pt" SelectedValue='<%# Eval("idxImpianto") %>' Enabled="false">
                             </asp:DropDownList>
-                            <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
+                            <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
                         </div>
                     </div>
                     <div class="row">
@@ -249,13 +249,13 @@
                             <asp:DropDownList ID="listMacchine" runat="server" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" Width="100%" BackColor="Silver" Font-Size="8pt" SelectedValue='<%# Eval("idxMacchina") %>' Enabled="false">
                             </asp:DropDownList>
                             <%--<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}"
-                                SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter">
+                                SelectMethod="getByConditio" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter">
                                 <SelectParameters>
                                     <asp:ControlParameter ControlID="listImpianti" DefaultValue="0" Name="conditio" PropertyName="SelectedValue"
                                         Type="Int32" />
                                 </SelectParameters>
                             </asp:ObjectDataSource>--%>
-                            <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
+                            <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
                         </div>
                     </div>
                     <div class="row" style="padding-top: 0.5em;">
@@ -270,7 +270,7 @@
                             </asp:DropDownList>
                             <asp:CompareValidator ID="cvCausale" runat="server" ErrorMessage="!!!" ControlToValidate="listCausali" CssClass="warnRed" Operator="NotEqual" ValueToCompare='<%# SteamWare.memLayer.ML.CRI("idxCausaleND") %>'></asp:CompareValidator>
                             <asp:ObjectDataSource ID="odsCausali" runat="server" OldValuesParameterFormatString="original_{0}"
-                                SelectMethod="getByConditioAndCurr" TypeName="GIM_data.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter" OnDataBinding="odsCausali_DataBinding">
+                                SelectMethod="getByConditioAndCurr" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter" OnDataBinding="odsCausali_DataBinding">
                                 <SelectParameters>
                                     <asp:ControlParameter ControlID="listMacchine" DefaultValue="0" Name="conditio" PropertyName="SelectedValue" Type="Int32" />
                                     <asp:ControlParameter ControlID="lblCausale" DefaultValue="0" Name="currVal" PropertyName="Text" Type="Int32" />
@@ -341,7 +341,7 @@
                                     <br />
                                     <asp:DropDownList runat="server" ID="ddlStato" CssClass="textEv_1" SelectedValue='<%# Bind("idxStato") %>' DataSourceID="odsStato" DataTextField="label" DataValueField="value">
                                     </asp:DropDownList>
-                                    <asp:ObjectDataSource ID="odsStato" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selStatoTableAdapter"></asp:ObjectDataSource>
+                                    <asp:ObjectDataSource ID="odsStato" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selStatoTableAdapter"></asp:ObjectDataSource>
                                 </div>
                                 <div class="col-sm-3">
                                     <asp:Label runat="server" ID="lblInterventi" Text='<%# traduci ("lblInterventi") %>' Font-Size="X-Small"></asp:Label>
@@ -362,7 +362,7 @@
         </div>
     </EditItemTemplate>
 </asp:FormView>
-<asp:ObjectDataSource ID="ods_default" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByIdx" TypeName="GIM_data.DS_applicazioneTableAdapters.v_intervExpTableAdapter" UpdateMethod="updateIntervento" OnUpdated="ods_default_Updated">
+<asp:ObjectDataSource ID="ods_default" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByIdx" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.v_intervExpTableAdapter" UpdateMethod="updateIntervento" OnUpdated="ods_default_Updated">
     <UpdateParameters>
         <asp:Parameter Name="Original_numIntMtz" Type="Int32" />
         <asp:Parameter Name="idxStato" Type="Int32" />
@@ -380,4 +380,4 @@
             Type="Int32" />
     </SelectParameters>
 </asp:ObjectDataSource>
-<asp:ObjectDataSource ID="odsAmbiti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selAmbitiTableAdapter"></asp:ObjectDataSource>
+<asp:ObjectDataSource ID="odsAmbiti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selAmbitiTableAdapter"></asp:ObjectDataSource>
diff --git a/GIM_site/WebUserControls/mod_dettInt_full.ascx b/GIM_site/WebUserControls/mod_dettInt_full.ascx
index 7f7681a..e8a9b00 100644
--- a/GIM_site/WebUserControls/mod_dettInt_full.ascx
+++ b/GIM_site/WebUserControls/mod_dettInt_full.ascx
@@ -67,7 +67,7 @@
                             <br />
                             <asp:DropDownList ID="listImpianti" runat="server" DataSourceID="odsImpianti" DataTextField="label" DataValueField="value" Width="100%" BackColor="#cdffcd" Font-Size="8pt" SelectedValue='<%# Bind("idxImpianto") %>'>
                             </asp:DropDownList>
-                            <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
+                            <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
                         </div>
                     </div>
                     <div class="row">
@@ -84,7 +84,7 @@
                             <br />
                             <asp:DropDownList ID="listMacchine" runat="server" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" Width="100%" BackColor="#cdffcd" Font-Size="8pt" SelectedValue='<%# Bind("idxMacchina") %>' AutoPostBack="true">
                             </asp:DropDownList>
-                            <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getFull" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
+                            <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getFull" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
                         </div>
                     </div>
                     <div class="row" style="padding-top: 0.5em;">
@@ -97,7 +97,7 @@
                             </asp:DropDownList>
                             <asp:CompareValidator ID="cvCausale" runat="server" ErrorMessage="!!!" ControlToValidate="listCausali" CssClass="warnRed" Operator="NotEqual" ValueToCompare='<%# SteamWare.memLayer.ML.CRI("idxCausaleND") %>'></asp:CompareValidator>
                             <asp:ObjectDataSource ID="odsCausali" runat="server" OldValuesParameterFormatString="original_{0}"
-                                SelectMethod="getByConditioAndCurr" TypeName="GIM_data.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter" OnDataBinding="odsCausali_DataBinding">
+                                SelectMethod="getByConditioAndCurr" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter" OnDataBinding="odsCausali_DataBinding">
                                 <SelectParameters>
                                     <asp:ControlParameter ControlID="listMacchine" DefaultValue="0" Name="conditio" PropertyName="SelectedValue" Type="Int32" />
                                     <asp:ControlParameter ControlID="lblCausale" DefaultValue="0" Name="currVal" PropertyName="Text" Type="Int32" />
@@ -110,13 +110,13 @@
                             <asp:Label runat="server" ID="lblDescrPriorita" Text='<%# traduci("lblDescrPriorita") %>' Font-Size="X-Small" />
                             <br />
                             <asp:DropDownList runat="server" ID="ddlPrior" Font-Bold="True" Font-Size="8pt" DataSourceID="odsPrior" DataTextField="label" DataValueField="value" CssClass="textEv_2" SelectedValue='<%# Bind("idxPriorita") %>' BackColor="#cdffcd" />
-                            <asp:ObjectDataSource ID="odsPrior" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selPriorTableAdapter"></asp:ObjectDataSource>
+                            <asp:ObjectDataSource ID="odsPrior" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selPriorTableAdapter"></asp:ObjectDataSource>
                             <br />
                             <asp:Label runat="server" ID="lblDescrTipo" Text='<%# traduci("lblDescrTipo") %>' Font-Size="X-Small" />
                             <br />
                             <asp:DropDownList runat="server" ID="ddlTipo" Font-Bold="True" Font-Size="9pt" CssClass="textEv_2" DataSourceID="odsTipo" DataTextField="label" DataValueField="value" SelectedValue='<%# Bind("idxTipo") %>' BackColor="#cdffcd">
                             </asp:DropDownList>
-                            <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
+                            <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
                         </div>
                         <div class="col-xs-9">
                             <asp:Label runat="server" ID="lblDescrizioneGen" Text='<%# traduci("lblDescrizioneGen") %>' Font-Size="X-Small" />
@@ -178,7 +178,7 @@
                                     DataSourceID="odsStato" DataTextField="label" DataValueField="value">
                                 </asp:DropDownList>
                                 <asp:ObjectDataSource ID="odsStato" runat="server" OldValuesParameterFormatString="Original_{0}"
-                                    SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selStatoTableAdapter"></asp:ObjectDataSource>
+                                    SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selStatoTableAdapter"></asp:ObjectDataSource>
                             </td>
                             <td rowspan="3" style="vertical-align: top; padding-left: 30px;">
                                 <uc1:mod_interventoOpMtz ID="mod_interventoOpMtz2" runat="server" vistaModulo="editing" />
@@ -212,7 +212,7 @@
     </EditItemTemplate>
 </asp:FormView>
 <asp:ObjectDataSource ID="ods_full" runat="server" OldValuesParameterFormatString="Original_{0}"
-    SelectMethod="getByIdx" TypeName="GIM_data.DS_applicazioneTableAdapters.v_intervExpTableAdapter"
+    SelectMethod="getByIdx" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.v_intervExpTableAdapter"
     UpdateMethod="updateInterventoFull" OnUpdated="ods_full_Updated">
     <UpdateParameters>
         <asp:Parameter Name="Original_numIntMtz" Type="Int32" />
@@ -238,4 +238,4 @@
         <asp:SessionParameter DefaultValue="0" Name="numIntMtz" SessionField="numIntMtz_sel" Type="Int32" />
     </SelectParameters>
 </asp:ObjectDataSource>
-<asp:ObjectDataSource ID="odsAmbiti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selAmbitiTableAdapter"></asp:ObjectDataSource>
+<asp:ObjectDataSource ID="odsAmbiti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selAmbitiTableAdapter"></asp:ObjectDataSource>
diff --git a/GIM_site/WebUserControls/mod_dettMtzProg.ascx b/GIM_site/WebUserControls/mod_dettMtzProg.ascx
index bb51403..806d210 100644
--- a/GIM_site/WebUserControls/mod_dettMtzProg.ascx
+++ b/GIM_site/WebUserControls/mod_dettMtzProg.ascx
@@ -12,7 +12,7 @@
         <div class="col-sm-7 col-md-6 text-right tSmall">
             <uc1:mod_filtro ID="mod_filtroImpianto" runat="server" css="txtMini" Oneh_selValore="eh_selectedImpianto" />
             <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}"
-                SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
+                SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
         </div>
     </div>
     <div class="row">
@@ -51,7 +51,7 @@
                     <asp:DropDownList runat="server" ID="ddlPrior" DataSourceID="odsPrior" DataTextField="label"
                         DataValueField="value" CssClass="textEv_1" OnDataBound="ddlPrior_DataBound" />
                     <asp:ObjectDataSource ID="odsPrior" runat="server" OldValuesParameterFormatString="original_{0}"
-                        SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selPriorTableAdapter"></asp:ObjectDataSource>
+                        SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selPriorTableAdapter"></asp:ObjectDataSource>
                 </div>
             </div>
             <div class="bloccoDiv" style="clear: both;">
@@ -64,7 +64,7 @@
                         DataTextField="label" DataValueField="value">
                     </asp:DropDownList>
                     <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="original_{0}"
-                        SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
+                        SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
                 </div>
             </div>
             <div class="bloccoDiv" style="clear: both;">
@@ -74,7 +74,7 @@
                         DataTextField="label" DataValueField="value">
                     </asp:DropDownList>
                     <asp:ObjectDataSource ID="odsFreq" runat="server" OldValuesParameterFormatString="original_{0}"
-                        SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selFreqTableAdapter"></asp:ObjectDataSource>
+                        SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selFreqTableAdapter"></asp:ObjectDataSource>
                 </div>
                 <div>
                     <asp:Label runat="server" ID="lblCadenza"><%: traduci("lblCadenza") %></asp:Label><br />
@@ -90,7 +90,7 @@
                         DataTextField="label" DataValueField="value" OnDataBound="ddlCausale_DataBound">
                     </asp:DropDownList>
                     <asp:ObjectDataSource ID="odsCausali" runat="server" OldValuesParameterFormatString="original_{0}"
-                        SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter"></asp:ObjectDataSource>
+                        SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter"></asp:ObjectDataSource>
                 </div>
             </div>
         </div>
@@ -98,7 +98,7 @@
             <div>
                 <asp:ListBox ID="listMacchine" runat="server" AutoPostBack="True" DataSourceID="odsMacchine" SelectionMode="Multiple" DataTextField="label" DataValueField="value" Rows="24 " Width="100%" BackColor="#ddeeff" Font-Size="8pt"></asp:ListBox>
                 <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}"
-                    SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"
+                    SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter"
                     FilterExpression="label LIKE '%{0}%'">
                     <FilterParameters>
                         <asp:ControlParameter ControlID="txtCercaMacchine" DefaultValue="*" Type="String"
diff --git a/GIM_site/WebUserControls/mod_elFamMacch.ascx b/GIM_site/WebUserControls/mod_elFamMacch.ascx
index f0ef357..7110187 100644
--- a/GIM_site/WebUserControls/mod_elFamMacch.ascx
+++ b/GIM_site/WebUserControls/mod_elFamMacch.ascx
@@ -60,7 +60,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagFamMacchineTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.AnagFamMacchineTableAdapter"
     UpdateMethod="Update" DeleteMethod="Delete" OldValuesParameterFormatString="Original_{0}"
     FilterExpression="nomeFamMacch LIKE '%{0}%' " InsertMethod="Insert" 
     onupdated="ods_Updated">
diff --git a/GIM_site/WebUserControls/mod_elFamMacch.ascx.cs b/GIM_site/WebUserControls/mod_elFamMacch.ascx.cs
index 3522601..3be0ce4 100644
--- a/GIM_site/WebUserControls/mod_elFamMacch.ascx.cs
+++ b/GIM_site/WebUserControls/mod_elFamMacch.ascx.cs
@@ -79,7 +79,7 @@ public partial class mod_elFamMacch : ApplicationUserControl
         // reset selezione...
         resetSelezione();
         // i primi valori ("0") di default sono "ND"... li inserisco come standard...
-        GIM_data.DS_applicazioneTableAdapters.AnagFamMacchineTableAdapter taFamMacc = new GIM_data.DS_applicazioneTableAdapters.AnagFamMacchineTableAdapter();
+        GIM_dataLayer.DS_applicazioneTableAdapters.AnagFamMacchineTableAdapter taFamMacc = new GIM_dataLayer.DS_applicazioneTableAdapters.AnagFamMacchineTableAdapter();
         taFamMacc.Insert(memLayer.ML.confReadString("newFamMacchina"));
         grView.DataBind();
     }
diff --git a/GIM_site/WebUserControls/mod_elMacch2Fam.ascx b/GIM_site/WebUserControls/mod_elMacch2Fam.ascx
index ff65f35..e8de9d2 100644
--- a/GIM_site/WebUserControls/mod_elMacch2Fam.ascx
+++ b/GIM_site/WebUserControls/mod_elMacch2Fam.ascx
@@ -36,7 +36,7 @@
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
 <asp:Label ID="lblFamMacc" runat="server" Visible="false" Text="0" />
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getByFam" TypeName="GIM_data.DS_applicazioneTableAdapters.v_selFamMaccTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getByFam" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.v_selFamMaccTableAdapter"
     DeleteMethod="DeleteQuery" OldValuesParameterFormatString="Original_{0}" 
    onDeleted="ods_Deleted" >
     <SelectParameters>
diff --git a/GIM_site/WebUserControls/mod_elencoMtzProg.ascx b/GIM_site/WebUserControls/mod_elencoMtzProg.ascx
index 4fb767d..ca27001 100644
--- a/GIM_site/WebUserControls/mod_elencoMtzProg.ascx
+++ b/GIM_site/WebUserControls/mod_elencoMtzProg.ascx
@@ -36,7 +36,7 @@
                                     DataTextField="label" DataValueField="value">
                                 </asp:DropDownList>
                                 <asp:ObjectDataSource ID="odsFreq" runat="server" OldValuesParameterFormatString="original_{0}"
-                                    SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selFreqTableAdapter"></asp:ObjectDataSource>
+                                    SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selFreqTableAdapter"></asp:ObjectDataSource>
                             </asp:Panel>
                         </div>
                         <div class="divSx" style="width: 200px;">
@@ -46,7 +46,7 @@
                                     DataTextField="label" DataValueField="value" OnDataBound="ddlCausale_DataBound">
                                 </asp:DropDownList>
                                 <asp:ObjectDataSource ID="odsCausali" runat="server" OldValuesParameterFormatString="original_{0}"
-                                    SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter"></asp:ObjectDataSource>
+                                    SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter"></asp:ObjectDataSource>
                             </asp:Panel>
                         </div>
                     </div>
@@ -57,7 +57,7 @@
                                 <asp:DropDownList runat="server" ID="ddlPrior" DataSourceID="odsPrior" DataTextField="label"
                                     DataValueField="value" CssClass="textEv_1" OnDataBound="ddlPrior_DataBound" />
                                 <asp:ObjectDataSource ID="odsPrior" runat="server" OldValuesParameterFormatString="original_{0}"
-                                    SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selPriorTableAdapter"></asp:ObjectDataSource>
+                                    SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selPriorTableAdapter"></asp:ObjectDataSource>
                             </asp:Panel>
                         </div>
                         <div class="divSx" style="width: 200px;">
@@ -67,7 +67,7 @@
                                     DataTextField="label" DataValueField="value">
                                 </asp:DropDownList>
                                 <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="original_{0}"
-                                    SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
+                                    SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
                             </asp:Panel>
                         </div>
                         <div class="divSx">
@@ -183,7 +183,7 @@
                 </Columns>
             </asp:GridView>
             <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
-                SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.v_mtzProgExpTableAdapter"
+                SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.v_mtzProgExpTableAdapter"
                 FilterExpression=" codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR descrizione LIKE '%{0}%' "
                 DeleteMethod="deleteQuery" InsertMethod="Insert" UpdateMethod="Update">
                 <FilterParameters>
diff --git a/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs b/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs
index 1c996bd..05d5357 100644
--- a/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs
+++ b/GIM_site/WebUserControls/mod_elencoMtzProg.ascx.cs
@@ -5,7 +5,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using SteamWare;
 using System.Data;
-using GIM_data;
+using GIM_dataLayer;
 
 public partial class mod_elencoMtzProg : ApplicationUserControl
 {
@@ -173,7 +173,7 @@ public partial class mod_elencoMtzProg : ApplicationUserControl
         {
             // ottengo  la riga tipizzata...
             System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem;
-            GIM_data.DS_applicazione.v_mtzProgExpRow riga = (GIM_data.DS_applicazione.v_mtzProgExpRow)_drv.Row;
+            GIM_dataLayer.DS_applicazione.v_mtzProgExpRow riga = (GIM_dataLayer.DS_applicazione.v_mtzProgExpRow)_drv.Row;
             if (SteamWare.memLayer.ML.StringSessionObj(_idxGridView) == riga.idxIntPro.ToString())
             {
                 grView.SelectedIndex = e.Row.RowIndex;
diff --git a/GIM_site/WebUserControls/mod_elencoRichieste.ascx b/GIM_site/WebUserControls/mod_elencoRichieste.ascx
index 1931f95..7fef911 100644
--- a/GIM_site/WebUserControls/mod_elencoRichieste.ascx
+++ b/GIM_site/WebUserControls/mod_elencoRichieste.ascx
@@ -11,7 +11,7 @@
         </div>
         <div style="float: left; margin-left: 8px;">
             <asp:DropDownList runat="server" ID="ddlFiltAmbito" DataSourceID="odsAmbito" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlFiltAmbito_SelectedIndexChanged"></asp:DropDownList>
-            <asp:ObjectDataSource ID="odsAmbito" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableFieldLang" TypeName="GIM_data.DS_utilityTableAdapters.v_selListValTableAdapter">
+            <asp:ObjectDataSource ID="odsAmbito" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByTableFieldLang" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selListValTableAdapter">
                 <SelectParameters>
                     <asp:Parameter DefaultValue="All" Name="TableName" Type="String" />
                     <asp:Parameter DefaultValue="FiltAmbito" Name="FieldName" Type="String" />
@@ -113,7 +113,7 @@
             </asp:TemplateField>
         </Columns>
     </asp:GridView>
-    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByPeriodoSearch" TypeName="GIM_data.DS_applicazioneTableAdapters.v_intervExpTableAdapter" FilterExpression=" (idxStato < 3) ">
+    <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByPeriodoSearch" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.v_intervExpTableAdapter" FilterExpression=" (idxStato < 3) ">
         <FilterParameters>
             <%--<asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />--%>
             <asp:SessionParameter DefaultValue="0" Name="idxTipo" SessionField="idxTipo_filt" Type="Int32" />
diff --git a/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs b/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs
index edd6ed0..021e644 100644
--- a/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs
+++ b/GIM_site/WebUserControls/mod_elencoRichieste.ascx.cs
@@ -161,7 +161,7 @@ public partial class mod_elencoRichieste : ApplicationUserControl
     /// <returns></returns>
     protected DataColumnCollection colonneObj()
     {
-        GIM_data.DS_applicazione.v_intervExpDataTable tabella = new GIM_data.DS_applicazione.v_intervExpDataTable();
+        GIM_dataLayer.DS_applicazione.v_intervExpDataTable tabella = new GIM_dataLayer.DS_applicazione.v_intervExpDataTable();
         DataColumnCollection colonne = tabella.Columns;
         return colonne;
     }
@@ -198,7 +198,7 @@ public partial class mod_elencoRichieste : ApplicationUserControl
         {
             // ottengo  la riga tipizzata...
             System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem;
-            GIM_data.DS_applicazione.v_intervExpRow riga = (GIM_data.DS_applicazione.v_intervExpRow)_drv.Row;
+            GIM_dataLayer.DS_applicazione.v_intervExpRow riga = (GIM_dataLayer.DS_applicazione.v_intervExpRow)_drv.Row;
             if (SteamWare.memLayer.ML.StringSessionObj(_idxGridView) == riga.numIntMtz.ToString())
             {
                 grView.SelectedIndex = e.Row.RowIndex;
diff --git a/GIM_site/WebUserControls/mod_famiglieMacchine.ascx b/GIM_site/WebUserControls/mod_famiglieMacchine.ascx
index 123d170..a5242ae 100644
--- a/GIM_site/WebUserControls/mod_famiglieMacchine.ascx
+++ b/GIM_site/WebUserControls/mod_famiglieMacchine.ascx
@@ -24,7 +24,7 @@
                         SelectionMode="Multiple" DataTextField="label" DataValueField="value" Height="250px"
                         Width="400px" BackColor="#ddeeff" Font-Size="8pt"></asp:ListBox>
                     <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}"
-                        SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"
+                        SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter"
                         FilterExpression="label LIKE '%{0}%'">
                         <FilterParameters>
                             <asp:ControlParameter ControlID="txtCercaMacchine" DefaultValue="*" Type="String"
diff --git a/GIM_site/WebUserControls/mod_fileUpload.ascx.cs b/GIM_site/WebUserControls/mod_fileUpload.ascx.cs
index 62c7c94..78aaa35 100644
--- a/GIM_site/WebUserControls/mod_fileUpload.ascx.cs
+++ b/GIM_site/WebUserControls/mod_fileUpload.ascx.cs
@@ -8,7 +8,7 @@ using System.IO;
 using System.Data;
 using System.Data.SqlClient;
 using System.Configuration;
-using GIM_data;
+using GIM_dataLayer;
 using System.Text;
 using SteamWare;
 
diff --git a/GIM_site/WebUserControls/mod_filtraMtzProg.ascx b/GIM_site/WebUserControls/mod_filtraMtzProg.ascx
index 1402fd8..ef946fa 100644
--- a/GIM_site/WebUserControls/mod_filtraMtzProg.ascx
+++ b/GIM_site/WebUserControls/mod_filtraMtzProg.ascx
@@ -10,7 +10,7 @@
         </div>
         <div>
             <uc1:mod_filtro ID="mod_filtroTipo" runat="server" css="txtMini" />
-            <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
+            <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
         </div>
     </div>
     <div class="col-sm-5 text-left">
@@ -19,11 +19,11 @@
         </div>
         <div>
             <uc1:mod_filtro ID="mod_filtroImpianto" runat="server" css="txtMini" Oneh_selValore="eh_selectedImpianto" />
-            <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
+            <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
         </div>
         <div>
             <uc1:mod_filtro ID="mod_filtroMacchina" runat="server" css="txtMini" Visible="false" />
-            <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter">
+            <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByConditio" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter">
                 <SelectParameters>
                     <asp:ControlParameter ControlID="mod_filtroImpianto" DefaultValue="0" Name="conditio" PropertyName="valoreInt" Type="Int32" />
                 </SelectParameters>
diff --git a/GIM_site/WebUserControls/mod_gestCausali.ascx b/GIM_site/WebUserControls/mod_gestCausali.ascx
index 64cdd96..7142160 100644
--- a/GIM_site/WebUserControls/mod_gestCausali.ascx
+++ b/GIM_site/WebUserControls/mod_gestCausali.ascx
@@ -4,7 +4,7 @@
 <uc1:mod_filtro ID="mod_filtroFam" runat="server" css="txtMini" changeCheckEnabled="false"
     changeCheckVisible="false" />
 <asp:ObjectDataSource ID="odsFam" runat="server" OldValuesParameterFormatString="Original_{0}"
-    SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selFamTableAdapter">
+    SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selFamTableAdapter">
 </asp:ObjectDataSource>
 <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="idxCausale" DataSourceID="ods" OnDataBound="grView_DataBound" PageSize="20" CssClass="table table-striped">
     <PagerStyle CssClass="active GridPager" />
@@ -76,7 +76,7 @@
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
 <asp:Label ID="lblFamMacc" runat="server" Visible="false" Text="0" />
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagCausaliTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.AnagCausaliTableAdapter"
     DeleteMethod="Delete" OldValuesParameterFormatString="original_{0}" OnDeleted="ods_Deleted"
     InsertMethod="Insert" UpdateMethod="UpdateQuery" FilterExpression="idxFamMacchine = {0}">
     <FilterParameters>
diff --git a/GIM_site/WebUserControls/mod_impianti.ascx b/GIM_site/WebUserControls/mod_impianti.ascx
index 282c01c..4cc9c97 100644
--- a/GIM_site/WebUserControls/mod_impianti.ascx
+++ b/GIM_site/WebUserControls/mod_impianti.ascx
@@ -148,7 +148,7 @@
     </Columns>
 </asp:GridView>
 <asp:ObjectDataSource ID="ods" runat="server" DeleteMethod="DeleteQuery" InsertMethod="Insert"
-    OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagImpiantiTableAdapter"
+    OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.AnagImpiantiTableAdapter"
     OnInserting="recuperaFooter" FilterExpression=" codImpianto LIKE '%{0}%' OR nomeImpianto LIKE '%{0}%' OR tipoImpianto LIKE '%{0}%' "
     UpdateMethod="Update" OnInserted="ods_Updated" OnUpdated="ods_Updated">
     <FilterParameters>
diff --git a/GIM_site/WebUserControls/mod_impianti.ascx.cs b/GIM_site/WebUserControls/mod_impianti.ascx.cs
index 34da45d..f867596 100644
--- a/GIM_site/WebUserControls/mod_impianti.ascx.cs
+++ b/GIM_site/WebUserControls/mod_impianti.ascx.cs
@@ -270,7 +270,7 @@ public partial class mod_impianti : ApplicationUserControl
     /// <returns></returns>
     protected DataColumnCollection colonneObj()
     {
-        GIM_data.DS_applicazione.AnagImpiantiDataTable tabella = new GIM_data.DS_applicazione.AnagImpiantiDataTable();
+        GIM_dataLayer.DS_applicazione.AnagImpiantiDataTable tabella = new GIM_dataLayer.DS_applicazione.AnagImpiantiDataTable();
         DataColumnCollection colonne = tabella.Columns;
         return colonne;
     }
@@ -295,7 +295,7 @@ public partial class mod_impianti : ApplicationUserControl
         {
             // ottengo  la riga tipizzata...
             System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem;
-            GIM_data.DS_applicazione.AnagImpiantiRow riga = (GIM_data.DS_applicazione.AnagImpiantiRow)_drv.Row;
+            GIM_dataLayer.DS_applicazione.AnagImpiantiRow riga = (GIM_dataLayer.DS_applicazione.AnagImpiantiRow)_drv.Row;
             if (SteamWare.memLayer.ML.StringSessionObj(_idxGridView) == riga.idxImpianto.ToString())
             {
                 grView.SelectedIndex = e.Row.RowIndex;
diff --git a/GIM_site/WebUserControls/mod_impiegoRisorse.ascx b/GIM_site/WebUserControls/mod_impiegoRisorse.ascx
index b9a2092..24fca72 100644
--- a/GIM_site/WebUserControls/mod_impiegoRisorse.ascx
+++ b/GIM_site/WebUserControls/mod_impiegoRisorse.ascx
@@ -79,7 +79,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getByNumIntMtz" TypeName="GIM_data.DS_applicazioneTableAdapters.ImpiegoRisorseTableAdapter" UpdateMethod="updateQuery" DeleteMethod="deleteQuery" OldValuesParameterFormatString="Original_{0}" InsertMethod="insertQuery" OnUpdating="ods_Updating">
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getByNumIntMtz" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.ImpiegoRisorseTableAdapter" UpdateMethod="updateQuery" DeleteMethod="deleteQuery" OldValuesParameterFormatString="Original_{0}" InsertMethod="insertQuery" OnUpdating="ods_Updating">
     <UpdateParameters>
         <asp:Parameter Name="CodRisorsa" Type="String" />
         <asp:Parameter Name="numIntMtz" Type="Int32" />
@@ -102,4 +102,4 @@
         <asp:Parameter Name="Note" Type="String" />
     </InsertParameters>
 </asp:ObjectDataSource>
-<asp:ObjectDataSource ID="odsATR" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selAnTipoRisTableAdapter"></asp:ObjectDataSource>
+<asp:ObjectDataSource ID="odsATR" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selAnTipoRisTableAdapter"></asp:ObjectDataSource>
diff --git a/GIM_site/WebUserControls/mod_insertRichiesta.ascx b/GIM_site/WebUserControls/mod_insertRichiesta.ascx
index a0a41f9..9b11e0d 100644
--- a/GIM_site/WebUserControls/mod_insertRichiesta.ascx
+++ b/GIM_site/WebUserControls/mod_insertRichiesta.ascx
@@ -29,7 +29,7 @@
                     <asp:Label runat="server" ID="lblImpianto" />
                     <div style="min-height: 400px; width: 100%;">
                         <asp:ListBox ID="listImpianti" runat="server" DataSourceID="odsImpianti" DataTextField="label" DataValueField="value" AutoPostBack="true" OnSelectedIndexChanged="listImpianti_SelectedIndexChanged" Rows="40" Width="100%" BackColor="#ddeeff" Font-Size="8pt"></asp:ListBox>
-                        <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
+                        <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
                     </div>
                     <asp:RequiredFieldValidator ID="rfvReparto" runat="server" ErrorMessage="!!!" ControlToValidate="listImpianti" ValidationGroup="inserimento" Display="Dynamic" CssClass="warnRed" />
                 </div>
@@ -42,7 +42,7 @@
                             <div style="min-height: 300px; width: 100%;">
                                 <asp:ListBox ID="listMacchine" runat="server" AutoPostBack="True" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" Rows="20" Width="100%" BackColor="#ddeeff" Font-Size="8pt"></asp:ListBox>
                                 <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}"
-                                    SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter">
+                                    SelectMethod="getByConditio" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter">
                                     <SelectParameters>
                                         <asp:ControlParameter ControlID="listImpianti" DefaultValue="0" Name="conditio" PropertyName="SelectedValue"
                                             Type="Int32" />
@@ -64,7 +64,7 @@
                                         <asp:DropDownList runat="server" ID="ddlPrior" DataSourceID="odsPrior" DataTextField="label"
                                             DataValueField="value" CssClass="textEv_1" />
                                         <asp:ObjectDataSource ID="odsPrior" runat="server" OldValuesParameterFormatString="original_{0}"
-                                            SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selPriorTableAdapter"></asp:ObjectDataSource>
+                                            SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selPriorTableAdapter"></asp:ObjectDataSource>
                                     </div>
                                     <div style="float: left; padding-top: 4px;">
                                         <asp:Label runat="server" ID="lblMatr" /><br />
@@ -85,7 +85,7 @@
                                         DataTextField="label" DataValueField="value">
                                     </asp:DropDownList>
                                     <asp:ObjectDataSource ID="odsAmbiti" runat="server" OldValuesParameterFormatString="original_{0}"
-                                        SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selAmbitiTableAdapter"></asp:ObjectDataSource>
+                                        SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selAmbitiTableAdapter"></asp:ObjectDataSource>
                                 </div>
                                 <div style="clear: both; text-align: left; border-top: 1px solid #ACACAC; height: 48px;">
                                     <asp:Label runat="server" ID="lblTipoGuasto" /><br />
@@ -93,7 +93,7 @@
                                         DataTextField="label" DataValueField="value">
                                     </asp:DropDownList>
                                     <asp:ObjectDataSource ID="odsTipo" runat="server" OldValuesParameterFormatString="original_{0}"
-                                        SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
+                                        SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selTipoGuastoTableAdapter"></asp:ObjectDataSource>
                                 </div>
                                 <div style="clear: both; text-align: left; border-top: 1px solid #ACACAC; height: 48px;">
                                     <div class="divSx">
@@ -124,7 +124,7 @@
                 <div id="causali">
                     <div style="min-height: 400px; width: 100%;" runat="server" id="divCausali">
                         <asp:ListBox ID="listCausali" runat="server" DataSourceID="odsCausali" DataTextField="label" DataValueField="value" AutoPostBack="true" Rows="40" Width="100%" BackColor="#ddeeff" Font-Size="8pt"></asp:ListBox>
-                        <asp:ObjectDataSource ID="odsCausali" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter">
+                        <asp:ObjectDataSource ID="odsCausali" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter">
                             <SelectParameters>
                                 <asp:ControlParameter ControlID="listMacchine" DefaultValue="0" Name="conditio" PropertyName="SelectedValue" Type="Int32" />
                             </SelectParameters>
diff --git a/GIM_site/WebUserControls/mod_interventoOpMtz.ascx b/GIM_site/WebUserControls/mod_interventoOpMtz.ascx
index 1da26fb..de220fb 100644
--- a/GIM_site/WebUserControls/mod_interventoOpMtz.ascx
+++ b/GIM_site/WebUserControls/mod_interventoOpMtz.ascx
@@ -39,7 +39,7 @@
                     DataValueField="value" AutoPostBack="true" SelectedValue='<%# Bind("matrOp") %>'>
                 </asp:DropDownList>
                 <asp:ObjectDataSource ID="odsOpMtz" runat="server" OldValuesParameterFormatString="Original_{0}"
-                    SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selOperMtzTableAdapter">
+                    SelectMethod="getData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selOperMtzTableAdapter">
                 </asp:ObjectDataSource>
             </EditItemTemplate>
             <ItemTemplate>
@@ -80,7 +80,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getByNumIntMtz" TypeName="GIM_data.DS_applicazioneTableAdapters.InterventoOpMtzTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getByNumIntMtz" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.InterventoOpMtzTableAdapter"
     UpdateMethod="UpdateQuery" DeleteMethod="Delete" OldValuesParameterFormatString="Original_{0}"
     InsertMethod="Insert">
     <UpdateParameters>
diff --git a/GIM_site/WebUserControls/mod_macchine.ascx b/GIM_site/WebUserControls/mod_macchine.ascx
index ad46518..de0b2db 100644
--- a/GIM_site/WebUserControls/mod_macchine.ascx
+++ b/GIM_site/WebUserControls/mod_macchine.ascx
@@ -5,7 +5,7 @@
 <%@ Register Src="~/WebUserControls/mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc2" %>
 <uc2:mod_filtro ID="mod_filtroImpianti" runat="server" css="txtMini" changeCheckEnabled="true" />
 <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}"
-    SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
+    SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
 <asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" PageSize="10" CssClass="table table-striped" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound" DataKeyNames="idxMacchina" DataSourceID="ods" OnRowDataBound="grView_RowDataBound" OnRowUpdating="grView_RowUpdating" OnPageIndexChanged="grView_PageIndexChanged" OnSorted="grView_Sorted" OnRowCancelingEdit="grView_RowCancelingEdit" OnRowEditing="grView_RowEditing">
     <PagerStyle CssClass="active GridPager" />
     <PagerSettings Mode="NumericFirstLast" />
@@ -305,7 +305,7 @@
 </asp:GridView>
 <asp:Label ID="lblImpianto" runat="server" Visible="false" Text="0" />
 <asp:ObjectDataSource ID="ods" runat="server" DeleteMethod="DeleteQuery" InsertMethod="Insert"
-    OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.v_macchineTableAdapter"
+    OldValuesParameterFormatString="Original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.v_macchineTableAdapter"
     OnInserting="recuperaFooter" FilterExpression=" codMacchina LIKE '%{0}%' OR nomeMacchina LIKE '%{0}%' OR modello LIKE '%{0}%' OR matricola LIKE '%{0}%' OR descrImpianto LIKE '%{0}%' "
     UpdateMethod="Update" OnInserted="ods_Updated" OnUpdated="ods_Updated">
     <FilterParameters>
diff --git a/GIM_site/WebUserControls/mod_macchine.ascx.cs b/GIM_site/WebUserControls/mod_macchine.ascx.cs
index 8a36eab..2bb3f69 100644
--- a/GIM_site/WebUserControls/mod_macchine.ascx.cs
+++ b/GIM_site/WebUserControls/mod_macchine.ascx.cs
@@ -350,7 +350,7 @@ public partial class mod_macchine : ApplicationUserControl
     /// <returns></returns>
     protected DataColumnCollection colonneObj()
     {
-        GIM_data.DS_applicazione.v_macchineDataTable tabella = new GIM_data.DS_applicazione.v_macchineDataTable();
+        GIM_dataLayer.DS_applicazione.v_macchineDataTable tabella = new GIM_dataLayer.DS_applicazione.v_macchineDataTable();
         DataColumnCollection colonne = tabella.Columns;
         return colonne;
     }
@@ -430,7 +430,7 @@ public partial class mod_macchine : ApplicationUserControl
         {
             // ottengo  la riga tipizzata...
             System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem;
-            GIM_data.DS_applicazione.v_macchineRow riga = (GIM_data.DS_applicazione.v_macchineRow)_drv.Row;
+            GIM_dataLayer.DS_applicazione.v_macchineRow riga = (GIM_dataLayer.DS_applicazione.v_macchineRow)_drv.Row;
             if (SteamWare.memLayer.ML.StringSessionObj(_idxGridView) == riga.idxImpianto.ToString())
             {
                 grView.SelectedIndex = e.Row.RowIndex;
diff --git a/GIM_site/WebUserControls/mod_magRic.ascx b/GIM_site/WebUserControls/mod_magRic.ascx
index f3d3d75..4a4884b 100644
--- a/GIM_site/WebUserControls/mod_magRic.ascx
+++ b/GIM_site/WebUserControls/mod_magRic.ascx
@@ -128,7 +128,7 @@
             </Columns>
         </asp:GridView>
         <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
-        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_MagTableAdapters.StatoMagTableAdapter"
+        <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_MagTableAdapters.StatoMagTableAdapter"
             UpdateMethod="updateQuery" DeleteMethod="deleteQuery" OldValuesParameterFormatString="Original_{0}"
             FilterExpression="Famiglia LIKE '%{0}%' OR Descrizione LIKE '%{0}%' OR NomeCostruttore LIKE '%{0}%' OR CodCostruttore LIKE '%{0}%' OR CodInterno LIKE '%{0}%'  OR CodLocazione LIKE '%{0}%' OR DescrLocazione LIKE '%{0}%' OR Note LIKE '%{0}%' " InsertMethod="insertQuery" OnUpdating="ods_Updating">
             <UpdateParameters>
@@ -164,10 +164,10 @@
             </InsertParameters>
         </asp:ObjectDataSource>
         <asp:HiddenField runat="server" ID="hfValoreCercato" />
-        <asp:ObjectDataSource runat="server" ID="odsLocazione" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_MagTableAdapters.AnagLocazioniTableAdapter"></asp:ObjectDataSource>
-        <asp:ObjectDataSource runat="server" ID="odsCodInternoEdit" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selCodRicAmmTableAdapter"></asp:ObjectDataSource>
+        <asp:ObjectDataSource runat="server" ID="odsLocazione" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_MagTableAdapters.AnagLocazioniTableAdapter"></asp:ObjectDataSource>
+        <asp:ObjectDataSource runat="server" ID="odsCodInternoEdit" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selCodRicAmmTableAdapter"></asp:ObjectDataSource>
 
-        <asp:ObjectDataSource runat="server" ID="odsGruppoCod" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selGrpCodRicAmmTableAdapter"></asp:ObjectDataSource>
+        <asp:ObjectDataSource runat="server" ID="odsGruppoCod" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selGrpCodRicAmmTableAdapter"></asp:ObjectDataSource>
     </div>
     <div class="col-xs-3" runat="server" id="divDetails" style="background-color: #d9edf7; padding: 2px; min-height: 525px;" visible="false">
         <uc1:mod_tag2Item runat="server" ID="mod_tag2Item" modoControllo="TAGS" />
diff --git a/GIM_site/WebUserControls/mod_mtzPrevPending.ascx b/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
index a949a4d..a4558f3 100644
--- a/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
+++ b/GIM_site/WebUserControls/mod_mtzPrevPending.ascx
@@ -37,7 +37,7 @@
         </Columns>
     </asp:GridView>
     <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
-    <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getBySearch" TypeName="GIM_data.DS_utilityTableAdapters.v_mtzProgPendingExpTableAdapter" OldValuesParameterFormatString="original_{0}">
+    <asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getBySearch" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_mtzProgPendingExpTableAdapter" OldValuesParameterFormatString="original_{0}">
         <SelectParameters>
             <asp:SessionParameter DefaultValue="%" Name="ricerca" SessionField="valoreCercato" Type="String" />
             <asp:SessionParameter DefaultValue="0" Name="idxTipo" SessionField="idxTipo_filt" Type="Int32" />
diff --git a/GIM_site/WebUserControls/mod_periodoAnalisi.ascx b/GIM_site/WebUserControls/mod_periodoAnalisi.ascx
index 77b9395..7717054 100644
--- a/GIM_site/WebUserControls/mod_periodoAnalisi.ascx
+++ b/GIM_site/WebUserControls/mod_periodoAnalisi.ascx
@@ -26,7 +26,7 @@
             DataSourceID="odsPeriodi" DataTextField="label" DataValueField="value">
         </asp:DropDownList>
         <asp:ObjectDataSource ID="odsPeriodi" runat="server" OldValuesParameterFormatString="original_{0}"
-            SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selPeriodiTradTableAdapter">
+            SelectMethod="getByConditio" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selPeriodiTradTableAdapter">
             <SelectParameters>
                 <asp:SessionParameter DefaultValue="IT" Name="conditio" SessionField="lingua" Type="String" />
                 <asp:ControlParameter ControlID="hfTPer" DefaultValue="0" Type="Int32" Name="tPeriodo" PropertyName="Value" />
diff --git a/GIM_site/WebUserControls/mod_priorita.ascx b/GIM_site/WebUserControls/mod_priorita.ascx
index 9b88d67..e9374c9 100644
--- a/GIM_site/WebUserControls/mod_priorita.ascx
+++ b/GIM_site/WebUserControls/mod_priorita.ascx
@@ -45,7 +45,7 @@
                 </asp:DropDownList> 
                 <asp:ObjectDataSource ID="odsStile" runat="server" 
                     OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" 
-                    TypeName="GIM_data.DS_utilityTableAdapters.v_selSemaforiTableAdapter">
+                    TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selSemaforiTableAdapter">
                 </asp:ObjectDataSource>
             </EditItemTemplate>
             <ItemTemplate>
@@ -74,7 +74,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagPrioritaTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.AnagPrioritaTableAdapter"
     UpdateMethod="UpdateQuery" DeleteMethod="DeleteQuery" OldValuesParameterFormatString="original_{0}"
     FilterExpression="descrPriorita LIKE '%{0}%' " InsertMethod="Insert">
     <UpdateParameters>
diff --git a/GIM_site/WebUserControls/mod_priorita.ascx.cs b/GIM_site/WebUserControls/mod_priorita.ascx.cs
index 1382727..4d31f7e 100644
--- a/GIM_site/WebUserControls/mod_priorita.ascx.cs
+++ b/GIM_site/WebUserControls/mod_priorita.ascx.cs
@@ -78,7 +78,7 @@ public partial class mod_priorita : ApplicationUserControl
         // reset selezione...
         resetSelezione();
         // i primi valori ("0") di default sono "ND"... li inserisco come standard...
-        GIM_data.DS_applicazioneTableAdapters.AnagPrioritaTableAdapter taPrior = new GIM_data.DS_applicazioneTableAdapters.AnagPrioritaTableAdapter();
+        GIM_dataLayer.DS_applicazioneTableAdapters.AnagPrioritaTableAdapter taPrior = new GIM_dataLayer.DS_applicazioneTableAdapters.AnagPrioritaTableAdapter();
         // calcolo ultimo libero e aggiungo 1...
         int nextFree = 1;
         try
diff --git a/GIM_site/WebUserControls/mod_reportInterventi.ascx b/GIM_site/WebUserControls/mod_reportInterventi.ascx
index add5463..6f19138 100644
--- a/GIM_site/WebUserControls/mod_reportInterventi.ascx
+++ b/GIM_site/WebUserControls/mod_reportInterventi.ascx
@@ -23,7 +23,7 @@
                             Width="350px" BackColor="#ddeeff" Font-Size="8pt" OnSelectedIndexChanged="listImpianti_SelectedIndexChanged"
                             OnDataBound="listImpianti_DataBound" />
                         <asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="original_{0}"
-                            SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"
+                            SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selImpiantiTableAdapter"
                             FilterExpression="label LIKE '%{0}%'">
                             <FilterParameters>
                                 <asp:ControlParameter ControlID="txtCercaImpianti" DefaultValue="*" Type="String"
@@ -45,7 +45,7 @@
                             Width="450px" BackColor="#ddffee" Font-Size="8pt" OnSelectedIndexChanged="listMacchine_SelectedIndexChanged"
                             OnDataBound="listMacchine_DataBound" />
                         <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}"
-                            SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"
+                            SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter"
                             FilterExpression="label LIKE '%{0}%'">
                             <FilterParameters>
                                 <asp:ControlParameter ControlID="txtCercaMacchine" DefaultValue="*" Type="String"
@@ -61,7 +61,7 @@
                             AutoPostBack="true" DataValueField="idxStato" OnDataBound="listaStati_DataBound"
                             SelectionMode="Multiple" OnSelectedIndexChanged="listaStati_SelectedIndexChanged"></asp:ListBox>
                         <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
-                            SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagStatiTableAdapter"></asp:ObjectDataSource>
+                            SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.AnagStatiTableAdapter"></asp:ObjectDataSource>
                     </div>
                     <div style="margin-left: 10px;">
                         <asp:CheckBox ID="chkShowOnlyMacchFerma" runat="server" Checked="false" AutoPostBack="True"
diff --git a/GIM_site/WebUserControls/mod_ricercaItem.ascx b/GIM_site/WebUserControls/mod_ricercaItem.ascx
index 311808e..94dbf6e 100644
--- a/GIM_site/WebUserControls/mod_ricercaItem.ascx
+++ b/GIM_site/WebUserControls/mod_ricercaItem.ascx
@@ -55,7 +55,7 @@
                 </asp:TemplateField>
             </Columns>
         </asp:GridView>
-        <asp:ObjectDataSource ID="odsFilt" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByIdxMacc" TypeName="GIM_data.DS_MagTableAdapters.StatoMagTableAdapter" FilterExpression="Famiglia LIKE '%{0}%' OR Descrizione LIKE '%{0}%' OR NomeCostruttore LIKE '%{0}%' OR CodCostruttore LIKE '%{0}%' OR CodInterno LIKE '%{0}%'  OR CodLocazione LIKE '%{0}%' OR DescrLocazione LIKE '%{0}%' OR Note LIKE '%{0}%' ">
+        <asp:ObjectDataSource ID="odsFilt" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByIdxMacc" TypeName="GIM_dataLayer.DS_MagTableAdapters.StatoMagTableAdapter" FilterExpression="Famiglia LIKE '%{0}%' OR Descrizione LIKE '%{0}%' OR NomeCostruttore LIKE '%{0}%' OR CodCostruttore LIKE '%{0}%' OR CodInterno LIKE '%{0}%'  OR CodLocazione LIKE '%{0}%' OR DescrLocazione LIKE '%{0}%' OR Note LIKE '%{0}%' ">
             <FilterParameters>
                 <asp:ControlParameter ControlID="txtCerca" Name="ricerca" PropertyName="Text" Type="String" />
             </FilterParameters>
diff --git a/GIM_site/WebUserControls/mod_selCodice.ascx b/GIM_site/WebUserControls/mod_selCodice.ascx
index 4e3c3cf..ef84426 100644
--- a/GIM_site/WebUserControls/mod_selCodice.ascx
+++ b/GIM_site/WebUserControls/mod_selCodice.ascx
@@ -6,9 +6,9 @@
     <i class="fa fa-wrench"></i>
     <asp:DropDownList runat="server" ID="ddlCodInterno" DataSourceID="odsCodInterno" DataTextField="value" DataValueField="value" OnSelectedIndexChanged="ddlCodInterno_SelectedIndexChanged" AutoPostBack="True"></asp:DropDownList>
 </span>
-<asp:ObjectDataSource runat="server" ID="odsCodInterno" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selCodRicAmmTableAdapter">
+<asp:ObjectDataSource runat="server" ID="odsCodInterno" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selCodRicAmmTableAdapter">
     <SelectParameters>
         <asp:ControlParameter ControlID="ddlGruppo" Name="conditio" PropertyName="SelectedValue" Type="String" />
     </SelectParameters>
 </asp:ObjectDataSource>
-<asp:ObjectDataSource runat="server" ID="odsGruppoCod" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_data.DS_utilityTableAdapters.v_selGrpCodRicAmmTableAdapter"></asp:ObjectDataSource>
+<asp:ObjectDataSource runat="server" ID="odsGruppoCod" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selGrpCodRicAmmTableAdapter"></asp:ObjectDataSource>
diff --git a/GIM_site/WebUserControls/mod_tag2Item.ascx b/GIM_site/WebUserControls/mod_tag2Item.ascx
index 8f4325d..ae7b499 100644
--- a/GIM_site/WebUserControls/mod_tag2Item.ascx
+++ b/GIM_site/WebUserControls/mod_tag2Item.ascx
@@ -9,7 +9,7 @@
         <asp:LinkButton runat="server" ID="lbtAddNew" CssClass="btn btn-success" OnClick="lbtAddNew_Click"><%: traduci("addNewTag2Item") %></asp:LinkButton>
         <div style="font-size: 0.8em;">
             <asp:DropDownList runat="server" ID="ddlTags" DataSourceID="odsTagsAvail" DataTextField="TagCode" DataValueField="TagCode"></asp:DropDownList>
-            <asp:ObjectDataSource runat="server" ID="odsTagsAvail" OldValuesParameterFormatString="original_{0}" SelectMethod="avail4item" TypeName="GIM_data.DS_MagTableAdapters.AnagTagsTableAdapter">
+            <asp:ObjectDataSource runat="server" ID="odsTagsAvail" OldValuesParameterFormatString="original_{0}" SelectMethod="avail4item" TypeName="GIM_dataLayer.DS_MagTableAdapters.AnagTagsTableAdapter">
                 <SelectParameters>
                     <asp:ControlParameter ControlID="hfIdxItem" DefaultValue="0" Name="idxItem" PropertyName="Value" Type="Int32" />
                 </SelectParameters>
@@ -64,7 +64,7 @@
         </Columns>
     </asp:GridView>
     <asp:Label ID="lblNumRecTags" runat="server" CssClass="txtMini"></asp:Label>
-    <asp:ObjectDataSource ID="odsByItem" runat="server" SelectMethod="getByItem" TypeName="GIM_data.DS_MagTableAdapters.Tag2ItemTableAdapter" OldValuesParameterFormatString="Original_{0}" DeleteMethod="Delete">
+    <asp:ObjectDataSource ID="odsByItem" runat="server" SelectMethod="getByItem" TypeName="GIM_dataLayer.DS_MagTableAdapters.Tag2ItemTableAdapter" OldValuesParameterFormatString="Original_{0}" DeleteMethod="Delete">
         <DeleteParameters>
             <asp:Parameter Name="Original_idxItem" Type="Int32" />
             <asp:Parameter Name="Original_TagCode" Type="String" />
@@ -144,7 +144,7 @@
         </Columns>
     </asp:GridView>
     <asp:Label ID="lblNumRecItem" runat="server" CssClass="txtMini"></asp:Label>
-    <asp:ObjectDataSource ID="odsByTags" runat="server" SelectMethod="getByTag" TypeName="GIM_data.DS_MagTableAdapters.AnagItemsTableAdapter" OldValuesParameterFormatString="original_{0}">
+    <asp:ObjectDataSource ID="odsByTags" runat="server" SelectMethod="getByTag" TypeName="GIM_dataLayer.DS_MagTableAdapters.AnagItemsTableAdapter" OldValuesParameterFormatString="original_{0}">
         <SelectParameters>
             <asp:ControlParameter ControlID="hfTagCode" Name="TagCode" PropertyName="Value" Type="String" />
         </SelectParameters>
diff --git a/GIM_site/WebUserControls/mod_tag2Item.ascx.cs b/GIM_site/WebUserControls/mod_tag2Item.ascx.cs
index 8add24a..9ee7707 100644
--- a/GIM_site/WebUserControls/mod_tag2Item.ascx.cs
+++ b/GIM_site/WebUserControls/mod_tag2Item.ascx.cs
@@ -5,7 +5,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using SteamWare;
-using GIM_data;
+using GIM_dataLayer;
 
 namespace GIM_site.WebUserControls
 {
diff --git a/GIM_site/WebUserControls/mod_tag2Macc.ascx b/GIM_site/WebUserControls/mod_tag2Macc.ascx
index be282ac..6cab871 100644
--- a/GIM_site/WebUserControls/mod_tag2Macc.ascx
+++ b/GIM_site/WebUserControls/mod_tag2Macc.ascx
@@ -34,7 +34,7 @@
         </Columns>
     </asp:GridView>
     <asp:Label ID="lblNumRecTags" runat="server" CssClass="txtMini"></asp:Label>
-    <asp:ObjectDataSource ID="odsByItem" runat="server" SelectMethod="getByItem" TypeName="GIM_data.DS_MagTableAdapters.Tag2ItemTableAdapter" OldValuesParameterFormatString="Original_{0}" DeleteMethod="Delete">
+    <asp:ObjectDataSource ID="odsByItem" runat="server" SelectMethod="getByItem" TypeName="GIM_dataLayer.DS_MagTableAdapters.Tag2ItemTableAdapter" OldValuesParameterFormatString="Original_{0}" DeleteMethod="Delete">
         <DeleteParameters>
             <asp:Parameter Name="Original_idxItem" Type="Int32" />
             <asp:Parameter Name="Original_TagCode" Type="String" />
@@ -66,7 +66,7 @@
                     Width="450px" BackColor="#ddffee" Font-Size="8pt" OnSelectedIndexChanged="listMacchine_SelectedIndexChanged"
                     OnDataBound="listMacchine_DataBound" />
                 <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}"
-                    SelectMethod="avail4tag" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"
+                    SelectMethod="avail4tag" TypeName="GIM_dataLayer.DS_utilityTableAdapters.v_selMacchineTableAdapter"
                     FilterExpression="label LIKE '%{0}%'">
                     <FilterParameters>
                         <asp:ControlParameter ControlID="txtCercaMacchine" DefaultValue="*" Type="String" Name="txtCercaMacchine" />
@@ -128,7 +128,7 @@
         </Columns>
     </asp:GridView>
     <asp:Label ID="lblNumRecMacc" runat="server" CssClass="txtMini"></asp:Label>
-    <asp:ObjectDataSource ID="odsByTags" runat="server" SelectMethod="getByTag" TypeName="GIM_data.DS_MagTableAdapters.AnagMacchineTableAdapter" OldValuesParameterFormatString="Original_{0}" DeleteMethod="deleteTag2Macc">
+    <asp:ObjectDataSource ID="odsByTags" runat="server" SelectMethod="getByTag" TypeName="GIM_dataLayer.DS_MagTableAdapters.AnagMacchineTableAdapter" OldValuesParameterFormatString="Original_{0}" DeleteMethod="deleteTag2Macc">
         <DeleteParameters>
             <asp:Parameter Name="Original_idxMacchina" Type="Int32" />
             <asp:ControlParameter ControlID="hfTagCode" Name="Original_TagCode" PropertyName="Value" Type="String" />
diff --git a/GIM_site/WebUserControls/mod_tag2Macc.ascx.cs b/GIM_site/WebUserControls/mod_tag2Macc.ascx.cs
index eedf423..437b790 100644
--- a/GIM_site/WebUserControls/mod_tag2Macc.ascx.cs
+++ b/GIM_site/WebUserControls/mod_tag2Macc.ascx.cs
@@ -5,7 +5,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using SteamWare;
-using GIM_data;
+using GIM_dataLayer;
 
 namespace GIM_site.WebUserControls
 {
diff --git a/GIM_site/WebUserControls/mod_testata.ascx.cs b/GIM_site/WebUserControls/mod_testata.ascx.cs
index cd810d6..fe236f3 100644
--- a/GIM_site/WebUserControls/mod_testata.ascx.cs
+++ b/GIM_site/WebUserControls/mod_testata.ascx.cs
@@ -5,7 +5,7 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using SteamWare;
-using GIM_data;
+using GIM_dataLayer;
 
 namespace GIM_site.WebUserControls
 {
diff --git a/GIM_site/WebUserControls/mod_tipoGuasto.ascx b/GIM_site/WebUserControls/mod_tipoGuasto.ascx
index db5a542..46b5550 100644
--- a/GIM_site/WebUserControls/mod_tipoGuasto.ascx
+++ b/GIM_site/WebUserControls/mod_tipoGuasto.ascx
@@ -59,7 +59,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagTipoGuastoTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.AnagTipoGuastoTableAdapter"
     UpdateMethod="Update" DeleteMethod="Delete" OldValuesParameterFormatString="original_{0}"
     FilterExpression="descrTipo LIKE '%{0}%' " InsertMethod="Insert">
     <UpdateParameters>
diff --git a/GIM_site/WebUserControls/mod_tipoGuasto.ascx.cs b/GIM_site/WebUserControls/mod_tipoGuasto.ascx.cs
index bb3371c..ad61b2a 100644
--- a/GIM_site/WebUserControls/mod_tipoGuasto.ascx.cs
+++ b/GIM_site/WebUserControls/mod_tipoGuasto.ascx.cs
@@ -78,7 +78,7 @@ public partial class mod_tipoGuasto : ApplicationUserControl
         // reset selezione...
         resetSelezione();
         // i primi valori ("0") di default sono "ND"... li inserisco come standard...
-        GIM_data.DS_applicazioneTableAdapters.AnagTipoGuastoTableAdapter taTipo = new GIM_data.DS_applicazioneTableAdapters.AnagTipoGuastoTableAdapter();
+        GIM_dataLayer.DS_applicazioneTableAdapters.AnagTipoGuastoTableAdapter taTipo = new GIM_dataLayer.DS_applicazioneTableAdapters.AnagTipoGuastoTableAdapter();
         taTipo.Insert(memLayer.ML.confReadString("newTipoGuasto"));
         grView.DataBind();
     }
diff --git a/GIM_site/WebUserControls/mod_tipoRisorsa.ascx b/GIM_site/WebUserControls/mod_tipoRisorsa.ascx
index 6180d1f..9cf9a75 100644
--- a/GIM_site/WebUserControls/mod_tipoRisorsa.ascx
+++ b/GIM_site/WebUserControls/mod_tipoRisorsa.ascx
@@ -56,7 +56,7 @@
     </Columns>
 </asp:GridView>
 <asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label>
-<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_data.DS_applicazioneTableAdapters.AnagTipoRisorsaTableAdapter"
+<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="GetData" TypeName="GIM_dataLayer.DS_applicazioneTableAdapters.AnagTipoRisorsaTableAdapter"
     UpdateMethod="updateQuery" DeleteMethod="deleteQuery" OldValuesParameterFormatString="original_{0}"
     FilterExpression=" (CodRisorsa LIKE '%{0}%') OR (UM LIKE '%{0}%') OR (DescrRisorsa LIKE '%{0}%') "
     InsertMethod="insertQuery">
diff --git a/GIM_site/WebUserControls/mod_tipoRisorsa.ascx.cs b/GIM_site/WebUserControls/mod_tipoRisorsa.ascx.cs
index 1d52a02..4efa9e7 100644
--- a/GIM_site/WebUserControls/mod_tipoRisorsa.ascx.cs
+++ b/GIM_site/WebUserControls/mod_tipoRisorsa.ascx.cs
@@ -80,7 +80,7 @@ namespace GIM_site.WebUserControls
         {
             // reset selezione...
             resetSelezione();
-            GIM_data.DS_applicazioneTableAdapters.AnagTipoRisorsaTableAdapter taATR = new GIM_data.DS_applicazioneTableAdapters.AnagTipoRisorsaTableAdapter();
+            GIM_dataLayer.DS_applicazioneTableAdapters.AnagTipoRisorsaTableAdapter taATR = new GIM_dataLayer.DS_applicazioneTableAdapters.AnagTipoRisorsaTableAdapter();
             taATR.insertQuery("--NEW--", "NR", "Description", memLayer.ML.confReadString("newValuta"));
             grView.DataBind();
         }
diff --git a/GIM_site/WebUserControls/mod_vocabolario.ascx.cs b/GIM_site/WebUserControls/mod_vocabolario.ascx.cs
index 32b65bd..8aeb268 100644
--- a/GIM_site/WebUserControls/mod_vocabolario.ascx.cs
+++ b/GIM_site/WebUserControls/mod_vocabolario.ascx.cs
@@ -9,7 +9,7 @@ using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 using SteamWare;
-using GIM_data;
+using GIM_dataLayer;
 
 public partial class mod_vocabolario : SteamWare.UserControl
 {
diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll
index f8621ee..6f69dad 100644
Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ
diff --git a/WebGIM.sln b/WebGIM.sln
index 3606817..fcb4d27 100644
--- a/WebGIM.sln
+++ b/WebGIM.sln
@@ -5,12 +5,12 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GIM_site", "GIM_site\GIM_site.csproj", "{02C16B9B-9E89-42A7-A59C-E85A21E102F3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GIM_data", "GIM_data\GIM_data.csproj", "{F66427C8-882A-4EF8-B42F-EF142906DC8C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWare", "..\..\SteamWare\SteamWareLib\SteamWare.csproj", "{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GIM_dataLayer", "GIM_dataLayer\GIM_dataLayer.csproj", "{B430E135-72EC-49D1-9C82-274294CF2F80}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Alumat|Any CPU = Alumat|Any CPU
@@ -39,22 +39,6 @@ Global
 		{02C16B9B-9E89-42A7-A59C-E85A21E102F3}.Somaschini|Any CPU.Build.0 = Somaschini|Any CPU
 		{02C16B9B-9E89-42A7-A59C-E85A21E102F3}.SomaschiniUSA|Any CPU.ActiveCfg = SomaschiniUSA|Any CPU
 		{02C16B9B-9E89-42A7-A59C-E85A21E102F3}.SomaschiniUSA|Any CPU.Build.0 = SomaschiniUSA|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.Alumat|Any CPU.ActiveCfg = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.Alumat|Any CPU.Build.0 = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.IIS01|Any CPU.Build.0 = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.IIS02|Any CPU.Build.0 = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.OVH|Any CPU.ActiveCfg = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.OVH|Any CPU.Build.0 = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.Somaschini|Any CPU.ActiveCfg = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.Somaschini|Any CPU.Build.0 = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU
-		{F66427C8-882A-4EF8-B42F-EF142906DC8C}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU
 		{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Alumat|Any CPU.ActiveCfg = Release|Any CPU
 		{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Alumat|Any CPU.Build.0 = Release|Any CPU
 		{BE594F80-8FC2-45BE-99D1-AEC73F71E41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -87,6 +71,22 @@ Global
 		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Somaschini|Any CPU.Build.0 = Release|Any CPU
 		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU
 		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.Alumat|Any CPU.ActiveCfg = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.Alumat|Any CPU.Build.0 = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.IIS01|Any CPU.Build.0 = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.IIS02|Any CPU.Build.0 = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.OVH|Any CPU.ActiveCfg = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.OVH|Any CPU.Build.0 = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.Somaschini|Any CPU.ActiveCfg = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.Somaschini|Any CPU.Build.0 = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU
+		{B430E135-72EC-49D1-9C82-274294CF2F80}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE