diff --git a/Step.Tasks/Properties/AssemblyInfo.cs b/Step.Core/Properties/AssemblyInfo.cs
similarity index 97%
rename from Step.Tasks/Properties/AssemblyInfo.cs
rename to Step.Core/Properties/AssemblyInfo.cs
index c56bdb12..1a5f3024 100644
--- a/Step.Tasks/Properties/AssemblyInfo.cs
+++ b/Step.Core/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 // Le informazioni generali relative a un assembly sono controllate dal seguente 
 // set di attributi. Modificare i valori di questi attributi per modificare le informazioni
 // associate a un assembly.
-[assembly: AssemblyTitle("Step.Tasks")]
+[assembly: AssemblyTitle("Step.Core")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
diff --git a/Step.Tasks/Step.Core.csproj b/Step.Core/Step.Core.csproj
similarity index 97%
rename from Step.Tasks/Step.Core.csproj
rename to Step.Core/Step.Core.csproj
index c331a73f..ef79688e 100644
--- a/Step.Tasks/Step.Core.csproj
+++ b/Step.Core/Step.Core.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{DE54FF4C-8390-4489-882A-1BC7D99EF185}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Step.Tasks</RootNamespace>
-    <AssemblyName>Step.Tasks</AssemblyName>
+    <RootNamespace>Step.Core</RootNamespace>
+    <AssemblyName>Step.Core</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
diff --git a/Step.Tasks/ThreadsFunctions.cs b/Step.Core/ThreadsFunctions.cs
similarity index 100%
rename from Step.Tasks/ThreadsFunctions.cs
rename to Step.Core/ThreadsFunctions.cs
diff --git a/Step.Tasks/ThreadsHandler.cs b/Step.Core/ThreadsHandler.cs
similarity index 100%
rename from Step.Tasks/ThreadsHandler.cs
rename to Step.Core/ThreadsHandler.cs
diff --git a/Step.sln b/Step.sln
index 46e287ae..d2deb7f1 100644
--- a/Step.sln
+++ b/Step.sln
@@ -31,7 +31,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Config", "Client.Con
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client.Utils", "Client.Utils\Client.Utils.csproj", "{34434B22-D546-4A5C-B575-49720C77643A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.Core", "Step.Tasks\Step.Core.csproj", "{DE54FF4C-8390-4489-882A-1BC7D99EF185}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.Core", "Step.Core\Step.Core.csproj", "{DE54FF4C-8390-4489-882A-1BC7D99EF185}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Step.NC", "Step.NC\Step.NC.csproj", "{B2366B08-96BD-4F6B-B748-B45089B87A14}"
 EndProject
diff --git a/Step/Step.csproj b/Step/Step.csproj
index b7e3e956..b633bd8c 100644
--- a/Step/Step.csproj
+++ b/Step/Step.csproj
@@ -312,6 +312,10 @@
       <Project>{3f5c2483-fc87-43ef-92a8-66ff7d0e440f}</Project>
       <Name>Step.Config</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Step.Core\Step.Core.csproj">
+      <Project>{de54ff4c-8390-4489-882a-1bc7d99ef185}</Project>
+      <Name>Step.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Step.Database\Step.Database.csproj">
       <Project>{357d5ee1-ffc8-489b-9232-22cf474d9a6f}</Project>
       <Name>Step.Database</Name>
@@ -324,10 +328,6 @@
       <Project>{b2366b08-96bd-4f6b-b748-b45089b87a14}</Project>
       <Name>Step.NC</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Step.Tasks\Step.Core.csproj">
-      <Project>{de54ff4c-8390-4489-882a-1bc7d99ef185}</Project>
-      <Name>Step.Core</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Step.UI\Step.UI.csproj">
       <Project>{20fc0937-e7ca-4693-95f9-7a948efd173b}</Project>
       <Name>Step.UI</Name>