diff --git a/IOB-UT-NEXT/Config/IobConfTree.cs b/IOB-UT-NEXT/Config/IobConfTree.cs
index 95b7c715..c92faadb 100644
--- a/IOB-UT-NEXT/Config/IobConfTree.cs
+++ b/IOB-UT-NEXT/Config/IobConfTree.cs
@@ -1,5 +1,6 @@
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Base;
+using IOB_UT_NEXT.Config.Mem;
 using IOB_UT_NEXT.Config.Special;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
diff --git a/IOB-UT-NEXT/plcMemMapExt.cs b/IOB-UT-NEXT/Config/Mem/plcMemMapExt.cs
similarity index 92%
rename from IOB-UT-NEXT/plcMemMapExt.cs
rename to IOB-UT-NEXT/Config/Mem/plcMemMapExt.cs
index 74d9fa29..7395aeba 100644
--- a/IOB-UT-NEXT/plcMemMapExt.cs
+++ b/IOB-UT-NEXT/Config/Mem/plcMemMapExt.cs
@@ -1,12 +1,7 @@
-using IOB_UT_NEXT.Config.Special;
-using MapoSDK;
-using System;
+using MapoSDK;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace IOB_UT_NEXT
+namespace IOB_UT_NEXT.Config.Mem
 {
     public class plcMemMapExt : plcMemMap
     {
diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
index af28ecdd..e4f658e1 100644
--- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj
+++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
@@ -156,8 +156,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BitUtils.cs" />
-    <Compile Include="ByteDataConverter.cs" />
+    <Compile Include="Services\Core\BitUtils.cs" />
+    <Compile Include="Services\Core\ByteDataConverter.cs" />
     <Compile Include="CallMetricsCollector.cs" />
     <Compile Include="Config\Base\AlarmDto.cs" />
     <Compile Include="Config\Base\CmdUriDto.cs" />
@@ -195,7 +195,7 @@
     <Compile Include="Config\GenActConf.cs" />
     <Compile Include="IniFile.cs" />
     <Compile Include="IntConditionCheck.cs" />
-    <Compile Include="BitConditionCheck.cs" />
+    <Compile Include="Services\Core\BitConditionCheck.cs" />
     <Compile Include="CustomObj.cs" />
     <Compile Include="Services\Data\DataExport.cs" />
     <Compile Include="Services\Files\Eurom63.cs" />
@@ -208,14 +208,14 @@
     <Compile Include="Services\Data\XmlDataSerializer.cs" />
     <Compile Include="JobTask2Exe.cs" />
     <Compile Include="MeasureUtils.cs" />
-    <Compile Include="plcMemMapExt.cs" />
+    <Compile Include="Config\Mem\plcMemMapExt.cs" />
     <Compile Include="TimerMan.cs" />
     <Compile Include="SingleThreadTaskScheduler.cs" />
     <Compile Include="TCMan.cs" />
     <Compile Include="TimeUtils.cs" />
     <Compile Include="ToMapo.cs" />
     <Compile Include="baseUtils.cs" />
-    <Compile Include="BinaryUtils.cs" />
+    <Compile Include="Services\Core\BinaryUtils.cs" />
     <Compile Include="Enums.cs" />
     <Compile Include="Services\Files\FileMover.cs" />
     <Compile Include="Logging.cs" />
@@ -249,9 +249,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Services\Core\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets" Condition="Exists('..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/IOB-UT-NEXT/Iob/BaseObj.cs b/IOB-UT-NEXT/Iob/BaseObj.cs
index 31e37bb8..61d8d3aa 100644
--- a/IOB-UT-NEXT/Iob/BaseObj.cs
+++ b/IOB-UT-NEXT/Iob/BaseObj.cs
@@ -1,4 +1,5 @@
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Config.Mem;
 using IOB_UT_NEXT.Services.Data;
 using NLog;
 using System;
diff --git a/IOB-UT-NEXT/BinaryUtils.cs b/IOB-UT-NEXT/Services/Core/BinaryUtils.cs
similarity index 98%
rename from IOB-UT-NEXT/BinaryUtils.cs
rename to IOB-UT-NEXT/Services/Core/BinaryUtils.cs
index d7edbc87..6a55bca0 100644
--- a/IOB-UT-NEXT/BinaryUtils.cs
+++ b/IOB-UT-NEXT/Services/Core/BinaryUtils.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Linq;
 using System.Numerics;
 
-namespace IOB_UT_NEXT
+namespace IOB_UT_NEXT.Services.Core
 {
     public class BinaryUtils : IFormatProvider, ICustomFormatter
     {
diff --git a/IOB-UT-NEXT/BitConditionCheck.cs b/IOB-UT-NEXT/Services/Core/BitConditionCheck.cs
similarity index 98%
rename from IOB-UT-NEXT/BitConditionCheck.cs
rename to IOB-UT-NEXT/Services/Core/BitConditionCheck.cs
index 07224b3f..688e34f8 100644
--- a/IOB-UT-NEXT/BitConditionCheck.cs
+++ b/IOB-UT-NEXT/Services/Core/BitConditionCheck.cs
@@ -1,4 +1,4 @@
-namespace IOB_UT_NEXT
+namespace IOB_UT_NEXT.Services.Core
 {
     public class BitConditionCheck
     {
diff --git a/IOB-UT-NEXT/BitUtils.cs b/IOB-UT-NEXT/Services/Core/BitUtils.cs
similarity index 80%
rename from IOB-UT-NEXT/BitUtils.cs
rename to IOB-UT-NEXT/Services/Core/BitUtils.cs
index 3193bdd5..fe3ff7ee 100644
--- a/IOB-UT-NEXT/BitUtils.cs
+++ b/IOB-UT-NEXT/Services/Core/BitUtils.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IOB_UT_NEXT
+namespace IOB_UT_NEXT.Services.Core
 {
     public class BitUtils
     {
diff --git a/IOB-UT-NEXT/ByteDataConverter.cs b/IOB-UT-NEXT/Services/Core/ByteDataConverter.cs
similarity index 97%
rename from IOB-UT-NEXT/ByteDataConverter.cs
rename to IOB-UT-NEXT/Services/Core/ByteDataConverter.cs
index 047dff32..dc13295f 100644
--- a/IOB-UT-NEXT/ByteDataConverter.cs
+++ b/IOB-UT-NEXT/Services/Core/ByteDataConverter.cs
@@ -1,4 +1,5 @@
-namespace IOB_UT_NEXT
+
+namespace IOB_UT_NEXT.Services.Core
 {
     public class ByteDataConverter
     {
diff --git a/IOB-UT-NEXT/baseUtils.cs b/IOB-UT-NEXT/baseUtils.cs
index 95549488..8cc20d8e 100644
--- a/IOB-UT-NEXT/baseUtils.cs
+++ b/IOB-UT-NEXT/baseUtils.cs
@@ -1,3 +1,4 @@
+using IOB_UT_NEXT.Services.Core;
 using IOB_UT_NEXT.Services.Files;
 using NLog;
 using RestSharp;
diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs
index 1d6241c5..964e7ba4 100644
--- a/IOB-WIN-FORM/Iob/Generic.cs
+++ b/IOB-WIN-FORM/Iob/Generic.cs
@@ -1,6 +1,8 @@
 using EgwProxy.Ftp;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Config.Mem;
+using IOB_UT_NEXT.Services.Core;
 using IOB_UT_NEXT.Services.Data;
 using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Networking;
diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
index 6faeec24..e3bfc4e1 100644
--- a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
+++ b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Config.Mem;
 using IOB_UT_NEXT.DataModel;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
@@ -16,7 +17,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using static IOB_UT_NEXT.ByteDataConverter;
+using static IOB_UT_NEXT.Services.Core.ByteDataConverter;
 
 namespace IOB_WIN_OPC_UA.IobOpc
 {
diff --git a/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs b/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs
index 571b1505..440a7c25 100644
--- a/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs
+++ b/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs
@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Config.Mem;
 using MapoSDK;
 using Newtonsoft.Json;
 using S7.Net;