diff --git a/Step.NC/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
similarity index 100%
rename from Step.NC/CMS_CORE_Library.dll
rename to Libs/CMS_CORE_Library.dll
diff --git a/Step.NC/CndexLinkDotNet.dll b/Libs/CndexLinkDotNet.dll
similarity index 100%
rename from Step.NC/CndexLinkDotNet.dll
rename to Libs/CndexLinkDotNet.dll
diff --git a/Step.NC/Fwlib32.dll b/Libs/Fwlib32.dll
similarity index 100%
rename from Step.NC/Fwlib32.dll
rename to Libs/Fwlib32.dll
diff --git a/Step.NC/Fwlib64.dll b/Libs/Fwlib64.dll
similarity index 100%
rename from Step.NC/Fwlib64.dll
rename to Libs/Fwlib64.dll
diff --git a/Step.NC/OSAI_ErrorMgr.dll b/Libs/OSAI_ErrorMgr.dll
similarity index 100%
rename from Step.NC/OSAI_ErrorMgr.dll
rename to Libs/OSAI_ErrorMgr.dll
diff --git a/Step.NC/OsaiTool.dll b/Libs/OsaiTool.dll
similarity index 100%
rename from Step.NC/OsaiTool.dll
rename to Libs/OsaiTool.dll
diff --git a/Step.NC/Siemens.Sinumerik.Operate.Services.Wrapper.dll b/Libs/Siemens.Sinumerik.Operate.Services.Wrapper.dll
similarity index 100%
rename from Step.NC/Siemens.Sinumerik.Operate.Services.Wrapper.dll
rename to Libs/Siemens.Sinumerik.Operate.Services.Wrapper.dll
diff --git a/Step.NC/Siemens.Sinumerik.Operate.Services.dll b/Libs/Siemens.Sinumerik.Operate.Services.dll
similarity index 100%
rename from Step.NC/Siemens.Sinumerik.Operate.Services.dll
rename to Libs/Siemens.Sinumerik.Operate.Services.dll
diff --git a/Step.NC/fwlib30i.dll b/Libs/fwlib30i.dll
similarity index 100%
rename from Step.NC/fwlib30i.dll
rename to Libs/fwlib30i.dll
diff --git a/Step.NC/fwlib30i64.dll b/Libs/fwlib30i64.dll
similarity index 100%
rename from Step.NC/fwlib30i64.dll
rename to Libs/fwlib30i64.dll
diff --git a/Step.NC/fwlibe1.dll b/Libs/fwlibe1.dll
similarity index 100%
rename from Step.NC/fwlibe1.dll
rename to Libs/fwlibe1.dll
diff --git a/Step.NC/fwlibe64.dll b/Libs/fwlibe64.dll
similarity index 100%
rename from Step.NC/fwlibe64.dll
rename to Libs/fwlibe64.dll
diff --git a/Step.NC/Step.NC.csproj b/Step.NC/Step.NC.csproj
index d166a8ce..80316b7c 100644
--- a/Step.NC/Step.NC.csproj
+++ b/Step.NC/Step.NC.csproj
@@ -34,7 +34,7 @@
   <ItemGroup>
     <Reference Include="CMS_CORE_Library, Version=1.1.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\CMS_CORE_Library.dll</HintPath>
+      <HintPath>..\Libs\CMS_CORE_Library.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -49,41 +49,6 @@
     <Compile Include="NcHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="CndexLinkDotNet.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="fwlib30i.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="fwlib30i64.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Fwlib32.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Fwlib64.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="fwlibe1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="fwlibe64.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OsaiTool.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="OSAI_ErrorMgr.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Siemens.Sinumerik.Operate.Services.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Siemens.Sinumerik.Operate.Services.Wrapper.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Language\ERR_english.INI">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -115,5 +80,51 @@
       <Name>Step.Utils</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\Libs\CndexLinkDotNet.dll">
+      <Link>CndexLinkDotNet.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Libs\fwlib30i.dll">
+      <Link>fwlib30i.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Libs\fwlib30i64.dll">
+      <Link>fwlib30i64.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Libs\Fwlib32.dll">
+      <Link>Fwlib32.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Libs\Fwlib64.dll">
+      <Link>Fwlib64.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Libs\fwlibe1.dll">
+      <Link>fwlibe1.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Libs\fwlibe64.dll">
+      <Link>fwlibe64.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Libs\OsaiTool.dll">
+      <Link>OsaiTool.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Libs\OSAI_ErrorMgr.dll">
+      <Link>OSAI_ErrorMgr.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Libs\Siemens.Sinumerik.Operate.Services.dll">
+      <Link>Siemens.Sinumerik.Operate.Services.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Libs\Siemens.Sinumerik.Operate.Services.Wrapper.dll">
+      <Link>Siemens.Sinumerik.Operate.Services.Wrapper.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Step.Tasks/Step.Core.csproj b/Step.Tasks/Step.Core.csproj
index baa84e58..3edcbb2d 100644
--- a/Step.Tasks/Step.Core.csproj
+++ b/Step.Tasks/Step.Core.csproj
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CMS_CORE_Library">
-      <HintPath>..\..\CMS_CORE_LIBRARY\CMS_CORE_Library\bin\x86\Debug\CMS_CORE_Library.dll</HintPath>
+      <HintPath>..\Libs\CMS_CORE_Library.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Step/Step.csproj b/Step/Step.csproj
index 95e9c4d7..c8cd2398 100644
--- a/Step/Step.csproj
+++ b/Step/Step.csproj
@@ -41,7 +41,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CMS_CORE_Library, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null" />
+    <Reference Include="CMS_CORE_Library">
+      <HintPath>..\Libs\CMS_CORE_Library.dll</HintPath>
+    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>