diff --git a/src/O2NextGen-Prototypes.sln b/src/O2NextGen-Prototypes.sln
index 5118ffb9..0f227af1 100644
--- a/src/O2NextGen-Prototypes.sln
+++ b/src/O2NextGen-Prototypes.sln
@@ -47,6 +47,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2.Tracker.DbUtility", "Ser
EndProject
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{5815FA40-82B7-400D-8FB0-667EED9DC622}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdks", "Sdks", "{033E8CA1-0464-45EB-B207-29EAB055FD9E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NG.Sdk.NetCore.Models", "SDKs\O2NG.Sdk.NetCore\O2NG.Sdk.NetCore.Models\O2NG.Sdk.NetCore.Models.csproj", "{929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -249,6 +253,18 @@ Global
{5815FA40-82B7-400D-8FB0-667EED9DC622}.Release|x64.Build.0 = Release|Any CPU
{5815FA40-82B7-400D-8FB0-667EED9DC622}.Release|x86.ActiveCfg = Release|Any CPU
{5815FA40-82B7-400D-8FB0-667EED9DC622}.Release|x86.Build.0 = Release|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|x64.Build.0 = Debug|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Debug|x86.Build.0 = Debug|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|x64.ActiveCfg = Release|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|x64.Build.0 = Release|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|x86.ActiveCfg = Release|Any CPU
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -274,6 +290,7 @@ Global
{1F48ABFB-4C4A-4E0C-A155-3DBAC0676C95} = {0DB9F20A-FD40-4110-807E-AAEFEFCCD574}
{20D19B8A-3C6E-49B4-BBC9-51EA63B86147} = {0DB9F20A-FD40-4110-807E-AAEFEFCCD574}
{ECC10F39-5198-481C-91D9-40C09A0E323F} = {E88D3DAC-13D1-4711-9ADD-BE97A3A57212}
+ {929F4E69-ED22-4ED4-B502-5DA85C2CC3FE} = {033E8CA1-0464-45EB-B207-29EAB055FD9E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5C9AF9F4-BF0A-486D-9F2E-17FE2F53F7E9}
diff --git a/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NG.Sdk.NetCore.Models.csproj b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NG.Sdk.NetCore.Models.csproj
new file mode 100644
index 00000000..2bd48b21
--- /dev/null
+++ b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NG.Sdk.NetCore.Models.csproj
@@ -0,0 +1,7 @@
+
+
+
+ netcoreapp2.2
+
+
+
diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Models/CertificateViewModel.cs b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/c-gen/CertificateViewModel.cs
similarity index 69%
rename from src/Services/c-gen/O2NextGen.CertificateManagement.Api/Models/CertificateViewModel.cs
rename to src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/c-gen/CertificateViewModel.cs
index 08f78970..0bc1945b 100644
--- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Models/CertificateViewModel.cs
+++ b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/c-gen/CertificateViewModel.cs
@@ -1,4 +1,4 @@
-namespace O2NextGen.CertificateManagement.Api.Models
+namespace O2NextGen.CertificateManagement.Api.Models.CGen
{
public class CertificateViewModel
{
diff --git a/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/e-sender/EmailRequestViewModel.cs b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/e-sender/EmailRequestViewModel.cs
new file mode 100644
index 00000000..19ffd4d9
--- /dev/null
+++ b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/e-sender/EmailRequestViewModel.cs
@@ -0,0 +1,17 @@
+namespace O2NextGen.CertificateManagement.Api.Models.ESender
+{
+ public class EmailRequestViewModel : IViewModel
+ {
+ public long Id { get; set; }
+ public string ExternalId { get; set; }
+ public long? ModifiedDate { get; set; }
+ public long? AddedDate { get; set; }
+ public long? DeletedDate { get; set; }
+ public bool? IsDeleted { get; set; }
+ public string From { get; set; }
+ public string To { get; set; }
+ public string Body { get; set; }
+ public string Subject { get; set; }
+ }
+}
+
diff --git a/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/e-sender/IViewModel.cs b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/e-sender/IViewModel.cs
new file mode 100644
index 00000000..82a7de5b
--- /dev/null
+++ b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/e-sender/IViewModel.cs
@@ -0,0 +1,13 @@
+namespace O2NextGen.CertificateManagement.Api.Models.ESender
+{
+ public interface IViewModel
+ {
+ long Id { get; set; }
+ string ExternalId { get; set; }
+ long? ModifiedDate { get; set; }
+ long? AddedDate { get; set; }
+ long? DeletedDate { get; set; }
+ bool? IsDeleted { get; set; }
+ }
+}
+
diff --git a/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.sln b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.sln
new file mode 100644
index 00000000..797381b5
--- /dev/null
+++ b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.sln
@@ -0,0 +1,36 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32112.339
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NG.Sdk.NetCore.Models", "O2NG.Sdk.NetCore.Models\O2NG.Sdk.NetCore.Models.csproj", "{89B48F28-7C0F-4329-9314-89511DB28429}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BEBD1434-109A-46D3-8377-50409D9E15FC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NG.Sdk.NetCore.Models", "Tests\Tests.O2NG.Sdk.NetCore.Models\Tests.O2NG.Sdk.NetCore.Models.csproj", "{9FA54822-4861-41BB-868F-476C517EF5D9}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {89B48F28-7C0F-4329-9314-89511DB28429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {89B48F28-7C0F-4329-9314-89511DB28429}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {89B48F28-7C0F-4329-9314-89511DB28429}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {89B48F28-7C0F-4329-9314-89511DB28429}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9FA54822-4861-41BB-868F-476C517EF5D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9FA54822-4861-41BB-868F-476C517EF5D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9FA54822-4861-41BB-868F-476C517EF5D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9FA54822-4861-41BB-868F-476C517EF5D9}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {9FA54822-4861-41BB-868F-476C517EF5D9} = {BEBD1434-109A-46D3-8377-50409D9E15FC}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {A6924222-66FF-4D49-A1AB-943C94659F1D}
+ EndGlobalSection
+EndGlobal
diff --git a/src/SDKs/O2NG.Sdk.NetCore/Tests/Tests.O2NG.Sdk.NetCore.Models/Tests.O2NG.Sdk.NetCore.Models.csproj b/src/SDKs/O2NG.Sdk.NetCore/Tests/Tests.O2NG.Sdk.NetCore.Models/Tests.O2NG.Sdk.NetCore.Models.csproj
new file mode 100644
index 00000000..a1c5113b
--- /dev/null
+++ b/src/SDKs/O2NG.Sdk.NetCore/Tests/Tests.O2NG.Sdk.NetCore.Models/Tests.O2NG.Sdk.NetCore.Models.csproj
@@ -0,0 +1,20 @@
+
+
+
+ netcoreapp3.1
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Controllers/VersionController.cs b/src/Services/auth/O2NextGen.Auth.Web/Controllers/VersionController.cs
index c2c2f872..b2ae4ed1 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Controllers/VersionController.cs
+++ b/src/Services/auth/O2NextGen.Auth.Web/Controllers/VersionController.cs
@@ -1,4 +1,3 @@
-using System;
using System.Reflection;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Startup.cs b/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
index 21c3c6df..d37a7998 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
+++ b/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
@@ -1,5 +1,4 @@
-using System.Text.Encodings.Web;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Identity.UI.Services;
diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/CertificatesController.cs b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/CertificatesController.cs
index 06b40c92..4539b34e 100644
--- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/CertificatesController.cs
+++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/CertificatesController.cs
@@ -1,11 +1,10 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using O2NextGen.CertificateManagement.Api.Models;
using O2NextGen.CertificateManagement.Api.Setup;
using O2NextGen.CertificateManagement.Business.Services;
using O2NextGen.CertificateManagement.Api.Mappings;
+using O2NextGen.CertificateManagement.Api.Models.CGen;
namespace O2NextGen.CertificateManagement.Api.Controllers
{
diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/VersionController.cs b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/VersionController.cs
index 74992e38..8034c294 100644
--- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/VersionController.cs
+++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/VersionController.cs
@@ -1,4 +1,3 @@
-using System;
using System.Reflection;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
@@ -7,7 +6,7 @@
namespace O2NextGen.CertificateManagement.Api.Controllers
{
-
+
[AllowAnonymous]
public class VersionController:ControllerBase
{
diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Mappings/CertificateMappings.cs b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Mappings/CertificateMappings.cs
index 464d5d29..24de71b9 100644
--- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Mappings/CertificateMappings.cs
+++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Mappings/CertificateMappings.cs
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
-using O2NextGen.CertificateManagement.Api.Models;
+using O2NextGen.CertificateManagement.Api.Models.CGen;
using O2NextGen.CertificateManagement.Business.Models;
namespace O2NextGen.CertificateManagement.Api.Mappings
diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj
index 654aaffd..6a60e2b0 100644
--- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj
+++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/O2NextGen.CertificateManagement.Api.csproj
@@ -30,6 +30,7 @@
+
diff --git a/src/Services/c-gen/O2NextGen.CertificateManagement.Impl/Services/CertificatesService.cs b/src/Services/c-gen/O2NextGen.CertificateManagement.Impl/Services/CertificatesService.cs
index 401deafd..7b8ff99a 100644
--- a/src/Services/c-gen/O2NextGen.CertificateManagement.Impl/Services/CertificatesService.cs
+++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Impl/Services/CertificatesService.cs
@@ -1,4 +1,3 @@
-using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs
index 07f2cb37..b55d01f6 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs
@@ -2,9 +2,9 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using O2NextGen.CertificateManagement.Api.Models.ESender;
using O2NextGen.ESender.Api.Helpers;
using O2NextGen.ESender.Api.Mappings;
-using O2NextGen.ESender.Api.Models;
using O2NextGen.ESender.Business.Services;
namespace O2NextGen.ESender.Api.Controllers
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs
index af4be29f..64cc819a 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs
@@ -2,9 +2,9 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using O2NextGen.CertificateManagement.Api.Models.ESender;
using O2NextGen.ESender.Api.Helpers;
using O2NextGen.ESender.Api.Mappings;
-using O2NextGen.ESender.Api.Models;
using O2NextGen.ESender.Business.Services;
namespace O2NextGen.ESender.Api.Controllers
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/VersionController.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/VersionController.cs
index 877533c8..12e13054 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/VersionController.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/VersionController.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/IoC/ServiceCollectionExtensions.cs b/src/Services/e-sender/O2NextGen.ESender.Api/IoC/ServiceCollectionExtensions.cs
index 4b39f4ec..7ee13c46 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/IoC/ServiceCollectionExtensions.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/IoC/ServiceCollectionExtensions.cs
@@ -1,13 +1,8 @@
using System;
-using System.Linq;
using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Formatters;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
using O2NextGen.ESender.Api.Filters;
using O2NextGen.ESender.Api.Helpers;
using O2NextGen.ESender.Business.Services;
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/BaseMappings.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/BaseMappings.cs
index 83a77898..c40bfd22 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/BaseMappings.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/BaseMappings.cs
@@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using O2NextGen.CertificateManagement.Api.Models.ESender;
using O2NextGen.ESender.Api.Extensions;
-using O2NextGen.ESender.Api.Models;
using O2NextGen.ESender.Business.Models;
namespace O2NextGen.ESender.Api.Mappings
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs
index c7871f8e..91445dd9 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
-using O2NextGen.ESender.Api.Models;
+using O2NextGen.CertificateManagement.Api.Models.ESender;
using O2NextGen.ESender.Business.Models;
namespace O2NextGen.ESender.Api.Mappings
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Models/EmailRequestViewModel.cs b/src/Services/e-sender/O2NextGen.ESender.Api/Models/EmailRequestViewModel.cs
deleted file mode 100644
index 79cb5e9e..00000000
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Models/EmailRequestViewModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-namespace O2NextGen.ESender.Api.Models
-{
- public interface IViewModel
- {
- long Id { get; set; }
- string ExternalId { get; set; }
- long? ModifiedDate { get; set; }
- long? AddedDate { get; set; }
- long? DeletedDate { get; set; }
- bool? IsDeleted { get; set; }
- }
- public class EmailRequestViewModel: IViewModel
- {
- public long Id { get; set; }
- public string ExternalId { get; set; }
- public long? ModifiedDate { get; set; }
- public long? AddedDate { get; set; }
- public long? DeletedDate { get; set; }
- public bool? IsDeleted { get; set; }
- public string From { get; set; }
- public string To { get; set; }
- public string Body { get; set; }
- public string Subject { get; set; }
- }
-}
-
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/O2NextGen.ESender.Api.csproj b/src/Services/e-sender/O2NextGen.ESender.Api/O2NextGen.ESender.Api.csproj
index b1d65de4..30b6be88 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/O2NextGen.ESender.Api.csproj
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/O2NextGen.ESender.Api.csproj
@@ -11,7 +11,6 @@
-
@@ -39,6 +38,7 @@
+
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Views/_ViewImports.cshtml b/src/Services/e-sender/O2NextGen.ESender.Api/Views/_ViewImports.cshtml
index 6f948c43..467974f5 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Views/_ViewImports.cshtml
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Views/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using O2NextGen.ESender.Api.Models
+@using O2NextGen.CertificateManagement.Api.Models.ESender
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/src/Services/on-tracker/O2.OnTracker.Api/Controllers/ValuesController.cs b/src/Services/on-tracker/O2.OnTracker.Api/Controllers/ValuesController.cs
index eac77e4e..c179edbe 100644
--- a/src/Services/on-tracker/O2.OnTracker.Api/Controllers/ValuesController.cs
+++ b/src/Services/on-tracker/O2.OnTracker.Api/Controllers/ValuesController.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
using System.Net;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Mvc;
using O2.Tracker.DbUtility;
diff --git a/src/Services/on-tracker/O2.OnTracker.Api/Program.cs b/src/Services/on-tracker/O2.OnTracker.Api/Program.cs
index a92deae8..60296917 100644
--- a/src/Services/on-tracker/O2.OnTracker.Api/Program.cs
+++ b/src/Services/on-tracker/O2.OnTracker.Api/Program.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
namespace O2.OnTracker.Api
{
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Controllers/VersionController.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Controllers/VersionController.cs
index ad483f54..84594039 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Controllers/VersionController.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Controllers/VersionController.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;