diff --git a/src/O2NextGen-Prototypes.sln b/src/O2NextGen-Prototypes.sln
index 852d251a..dc6376a6 100644
--- a/src/O2NextGen-Prototypes.sln
+++ b/src/O2NextGen-Prototypes.sln
@@ -49,8 +49,6 @@ Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-co
 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
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.OnTracker.Business", "Services\on-tracker\O2NextGen.OnTracker.Business\O2NextGen.OnTracker.Business.csproj", "{D8F151B3-569D-4257-9DD2-2270FB1D347A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.OnTracker.Data", "Services\on-tracker\O2NextGen.OnTracker.Data\O2NextGen.OnTracker.Data.csproj", "{5618F488-A7E7-49EB-9545-F482780ED926}"
@@ -99,7 +97,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "teambrain", "teambrain", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "a-discount", "a-discount", "{41ECEE68-B668-45CB-A3F0-DAC0BCF20D89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.SmallTalk.SignalrHub", "Services\smalltalk\O2NextGen.SmallTalk.SignalrHub\O2NextGen.SmallTalk.SignalrHub.csproj", "{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.SmallTalk.SignalrHub", "Services\smalltalk\O2NextGen.SmallTalk.SignalrHub\O2NextGen.SmallTalk.SignalrHub.csproj", "{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "media-basket", "media-basket", "{A911AC69-B8E0-4AF7-90F7-4A9EDCEE6B37}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.MediaBasket.Api", "Services\media-basket\O2NextGen.MediaBasket.Api\O2NextGen.MediaBasket.Api.csproj", "{B7460077-D87E-48E1-A8B1-9C11F602510A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.MediaBasket.Business", "Services\media-basket\O2NextGen.MediaBasket.Business\O2NextGen.MediaBasket.Business.csproj", "{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.MediaBasket.Data", "Services\media-basket\O2NextGen.MediaBasket.Data\O2NextGen.MediaBasket.Data.csproj", "{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.MediaBasket.Impl", "Services\media-basket\O2NextGen.MediaBasket.Impl\O2NextGen.MediaBasket.Impl.csproj", "{4CB15034-7B64-4785-8FB0-BE7A92630E1E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.Sdk.NetCore.Models", "SDKs\O2NG.Sdk.NetCore\O2NG.Sdk.NetCore.Models\O2NextGen.Sdk.NetCore.Models.csproj", "{006CA361-91E1-4310-87EF-97C997E54D97}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -303,18 +313,6 @@ 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
 		{D8F151B3-569D-4257-9DD2-2270FB1D347A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D8F151B3-569D-4257-9DD2-2270FB1D347A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D8F151B3-569D-4257-9DD2-2270FB1D347A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -507,6 +505,66 @@ Global
 		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Release|x64.Build.0 = Release|Any CPU
 		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Release|x86.ActiveCfg = Release|Any CPU
 		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429}.Release|x86.Build.0 = Release|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Debug|x64.Build.0 = Debug|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Debug|x86.Build.0 = Debug|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Release|x64.ActiveCfg = Release|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Release|x64.Build.0 = Release|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Release|x86.ActiveCfg = Release|Any CPU
+		{B7460077-D87E-48E1-A8B1-9C11F602510A}.Release|x86.Build.0 = Release|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Debug|x64.Build.0 = Debug|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Release|x64.ActiveCfg = Release|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Release|x64.Build.0 = Release|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5}.Release|x86.Build.0 = Release|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Debug|x64.Build.0 = Debug|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Debug|x86.Build.0 = Debug|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Release|x64.ActiveCfg = Release|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Release|x64.Build.0 = Release|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Release|x86.ActiveCfg = Release|Any CPU
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8}.Release|x86.Build.0 = Release|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Debug|x64.Build.0 = Debug|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Debug|x86.Build.0 = Debug|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Release|x64.ActiveCfg = Release|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Release|x64.Build.0 = Release|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Release|x86.ActiveCfg = Release|Any CPU
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E}.Release|x86.Build.0 = Release|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Debug|x64.Build.0 = Debug|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Debug|x86.Build.0 = Debug|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Release|x64.ActiveCfg = Release|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Release|x64.Build.0 = Release|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Release|x86.ActiveCfg = Release|Any CPU
+		{006CA361-91E1-4310-87EF-97C997E54D97}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -532,7 +590,6 @@ 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}
 		{D8F151B3-569D-4257-9DD2-2270FB1D347A} = {E88D3DAC-13D1-4711-9ADD-BE97A3A57212}
 		{5618F488-A7E7-49EB-9545-F482780ED926} = {E88D3DAC-13D1-4711-9ADD-BE97A3A57212}
 		{F41251EB-5CDE-4D3E-BF44-BA39D610D430} = {E88D3DAC-13D1-4711-9ADD-BE97A3A57212}
@@ -558,6 +615,12 @@ Global
 		{4BAA467F-6F58-4C99-ACCF-88F2ADD398B8} = {574CE1BF-397E-4262-82AD-94FB1CE98DA2}
 		{41ECEE68-B668-45CB-A3F0-DAC0BCF20D89} = {574CE1BF-397E-4262-82AD-94FB1CE98DA2}
 		{C4AE66A7-2DC5-410C-B17C-9A23DBD0A429} = {0DB9F20A-FD40-4110-807E-AAEFEFCCD574}
+		{A911AC69-B8E0-4AF7-90F7-4A9EDCEE6B37} = {574CE1BF-397E-4262-82AD-94FB1CE98DA2}
+		{B7460077-D87E-48E1-A8B1-9C11F602510A} = {A911AC69-B8E0-4AF7-90F7-4A9EDCEE6B37}
+		{A88A8CF5-89D4-4CF4-892F-914F8C97DCE5} = {A911AC69-B8E0-4AF7-90F7-4A9EDCEE6B37}
+		{77C5141A-ED22-4C87-AE0A-76EE5382CDB8} = {A911AC69-B8E0-4AF7-90F7-4A9EDCEE6B37}
+		{4CB15034-7B64-4785-8FB0-BE7A92630E1E} = {A911AC69-B8E0-4AF7-90F7-4A9EDCEE6B37}
+		{006CA361-91E1-4310-87EF-97C997E54D97} = {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/O2NextGen.Sdk.NetCore.Models.csproj b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NextGen.Sdk.NetCore.Models.csproj
index 2bd48b21..84a4445b 100644
--- a/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NextGen.Sdk.NetCore.Models.csproj
+++ b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NextGen.Sdk.NetCore.Models.csproj
@@ -4,4 +4,8 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.2.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/c-gen/CertificateViewModel.cs b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/c-gen/CertificateViewModel.cs
index 0bc1945b..04f7e12e 100644
--- a/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/c-gen/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.CGen
+namespace O2NextGen.Sdk.NetCore.Models.c_gen
 {
     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
index 19ffd4d9..bab91a2c 100644
--- 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
@@ -1,4 +1,4 @@
-namespace O2NextGen.CertificateManagement.Api.Models.ESender
+namespace O2NextGen.Sdk.NetCore.Models.e_sender
 {
     public class EmailRequestViewModel : IViewModel
     {
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
index 82a7de5b..f991eeca 100644
--- 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
@@ -1,4 +1,4 @@
-namespace O2NextGen.CertificateManagement.Api.Models.ESender
+namespace O2NextGen.Sdk.NetCore.Models.e_sender
 {
     public interface IViewModel
     {
diff --git a/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/media-basket/MediaViewModel.cs b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/media-basket/MediaViewModel.cs
new file mode 100644
index 00000000..98c83840
--- /dev/null
+++ b/src/SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/media-basket/MediaViewModel.cs
@@ -0,0 +1,24 @@
+using System;
+using Microsoft.AspNetCore.Http;
+
+namespace O2NextGen.Sdk.NetCore.Models.media_basket
+{
+    public class MediaViewModel
+    {
+        public long Id { get; set; }
+        public string Name { get; set; }
+        public string Url { get; set; }
+        public string Description { get; set; }
+        public DateTime? DateAdded { get; set; }
+        public string PublicId { get; set; }
+        public string AccountId { get; set; }
+        public IFormFile File { get; set; }
+        public string PreviewUrl { get; set; }
+        public int? Height { get; set; }
+        public int? Width { get; set; }
+        public string ExtType { get; set; }
+        public string ContentType { get; set; }
+        public string MediaType { get; set; }
+        public string OriginalName { get; set; }
+    }
+}
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Extensions/IdentityServerExtensions.cs b/src/Services/auth/O2NextGen.Auth.Web/Extensions/IdentityServerExtensions.cs
index e43692c6..b07ff70f 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Extensions/IdentityServerExtensions.cs
+++ b/src/Services/auth/O2NextGen.Auth.Web/Extensions/IdentityServerExtensions.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using IdentityServer4;
 using IdentityServer4.Models;
 using IdentityServer4.Services;
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/AccessDenied.cshtml b/src/Services/auth/O2NextGen.Auth.Web/Pages/AccessDenied.cshtml
index 4a22a1b8..b416d4e5 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Pages/AccessDenied.cshtml
+++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/AccessDenied.cshtml
@@ -1,5 +1,5 @@
 @page
-@model O2NextGen.Auth.Web.Pages.Account.AccessDenied
+@model O2NextGen.Auth.Web.Pages.AccessDenied
 
 @{
     Layout = null;
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/AccessDenied.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Web/Pages/AccessDenied.cshtml.cs
index 7e1acff4..cf43835d 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Pages/AccessDenied.cshtml.cs
+++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/AccessDenied.cshtml.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace O2NextGen.Auth.Web.Pages.Account
+namespace O2NextGen.Auth.Web.Pages
 {
     public class AccessDenied : PageModel
     {
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/Logout.cshtml b/src/Services/auth/O2NextGen.Auth.Web/Pages/Logout.cshtml
index a6c6b8ed..91878f7f 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Pages/Logout.cshtml
+++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/Logout.cshtml
@@ -1,5 +1,5 @@
 @page
-@model O2NextGen.Auth.Web.Pages.Account.LogoutModel
+@model O2NextGen.Auth.Web.Pages.LogoutModel
 
 @{
     Layout = null;
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/Logout.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Web/Pages/Logout.cshtml.cs
index 28959cba..1934cf7b 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Pages/Logout.cshtml.cs
+++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/Logout.cshtml.cs
@@ -6,7 +6,7 @@
 using Microsoft.Extensions.Logging;
 using O2NextGen.Auth.Web.Data;
 
-namespace O2NextGen.Auth.Web.Pages.Account
+namespace O2NextGen.Auth.Web.Pages
 {
     [AllowAnonymous]
     public class LogoutModel : PageModel
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml b/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml
index 765d1e0f..83f994a6 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml
+++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml
@@ -1,5 +1,5 @@
 @page
-@model RegisterModel
+@model O2NextGen.Auth.Web.Pages.RegisterModel
 @inject Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer Localizer
 
 <div class="row">
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml.cs b/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml.cs
index 12165b49..490a8de6 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml.cs
+++ b/src/Services/auth/O2NextGen.Auth.Web/Pages/Register.cshtml.cs
@@ -12,7 +12,7 @@
 using O2NextGen.Auth.Web.Data;
 using O2NextGen.Auth.Web.Resources;
 
-namespace O2NextGen.Auth.Web.Pages.Account
+namespace O2NextGen.Auth.Web.Pages
 {
     [AllowAnonymous]
     public class RegisterModel : PageModel
diff --git a/src/Services/auth/O2NextGen.Auth.Web/Startup.cs b/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
index 41562841..e9d2f28e 100644
--- a/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
+++ b/src/Services/auth/O2NextGen.Auth.Web/Startup.cs
@@ -1,14 +1,11 @@
 using System.IdentityModel.Tokens.Jwt;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using O2NextGen.Auth.Web.Data;
 using O2NextGen.Auth.Web.Extensions;
 using O2NextGen.Auth.Web.Helpers;
 using O2NextGen.Auth.Web.Utilities;
diff --git a/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs
index 514d1004..90af0853 100644
--- a/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs
+++ b/src/Services/auth/Tests/Tests.O2NextGen.Auth.Web/InputModelTests.cs
@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using O2NextGen.Auth.Web.Pages.Account;
+using O2NextGen.Auth.Web.Pages;
 
 namespace Tests.O2NextGen.Auth.Web
 {
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 4539b34e..aedcba5b 100644
--- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/CertificatesController.cs
+++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Controllers/CertificatesController.cs
@@ -4,7 +4,7 @@
 using O2NextGen.CertificateManagement.Api.Setup;
 using O2NextGen.CertificateManagement.Business.Services;
 using O2NextGen.CertificateManagement.Api.Mappings;
-using O2NextGen.CertificateManagement.Api.Models.CGen;
+using O2NextGen.Sdk.NetCore.Models.c_gen;
 
 namespace O2NextGen.CertificateManagement.Api.Controllers
 {
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 24de71b9..3955d335 100644
--- a/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Mappings/CertificateMappings.cs
+++ b/src/Services/c-gen/O2NextGen.CertificateManagement.Api/Mappings/CertificateMappings.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using O2NextGen.CertificateManagement.Api.Models.CGen;
 using O2NextGen.CertificateManagement.Business.Models;
+using O2NextGen.Sdk.NetCore.Models.c_gen;
 
 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 c7bb9e21..ba989a7c 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
@@ -27,7 +27,7 @@
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.File" Version="2.2.0">
     </PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
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 b55d01f6..3e35e6c2 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/BoardController.cs
@@ -2,10 +2,10 @@
 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.Business.Services;
+using O2NextGen.Sdk.NetCore.Models.e_sender;
 
 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 64cc819a..f8e2ec12 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Controllers/EmailSenderController.cs
@@ -2,10 +2,10 @@
 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.Business.Services;
+using O2NextGen.Sdk.NetCore.Models.e_sender;
 
 namespace O2NextGen.ESender.Api.Controllers
 {
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 c40bfd22..65d591e0 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/BaseMappings.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/BaseMappings.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using O2NextGen.CertificateManagement.Api.Models.ESender;
 using O2NextGen.ESender.Api.Extensions;
 using O2NextGen.ESender.Business.Models;
+using O2NextGen.Sdk.NetCore.Models.e_sender;
 
 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 91445dd9..d55f894a 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Mappings/EmailRequestMappings.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using O2NextGen.CertificateManagement.Api.Models.ESender;
 using O2NextGen.ESender.Business.Models;
+using O2NextGen.Sdk.NetCore.Models.e_sender;
 
 namespace O2NextGen.ESender.Api.Mappings
 {
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 bb73937a..8e9ba165 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
@@ -29,7 +29,7 @@
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.File" Version="2.2.0">
     </PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Create.cshtml b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Create.cshtml
index 01a33fac..9e492035 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Create.cshtml
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Create.cshtml
@@ -1,4 +1,4 @@
-@model EmailRequestViewModel
+@model O2NextGen.Sdk.NetCore.Models.e_sender.EmailRequestViewModel
 
 <form asp-controller="Board" asp-action="CreateReally" method="post">
     <label asp-for="From">From</label>
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Detail.cshtml b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Detail.cshtml
index fed1dda1..ee0797c8 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Detail.cshtml
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Detail.cshtml
@@ -1,5 +1,5 @@
 
-@model EmailRequestViewModel
+@model O2NextGen.Sdk.NetCore.Models.e_sender.EmailRequestViewModel
 
 <form asp-controller="Board" asp-action="Edit" asp-route-id="@Model.Id">
     <label asp-for="From">From</label>
diff --git a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Index.cshtml b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Index.cshtml
index a8621047..a03e2e2c 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Index.cshtml
+++ b/src/Services/e-sender/O2NextGen.ESender.Api/Views/Board/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<EmailRequestViewModel>
+@model IEnumerable<O2NextGen.Sdk.NetCore.Models.e_sender.EmailRequestViewModel>
 <h1> E-Sender Service</h1>
 <h2>Administration board v1.0.0.0</h2>
 <style>
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 467974f5..0cc96a4d 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.CertificateManagement.Api.Models.ESender
+@using O2NextGen.Sdk.NetCore.Models.e_sender
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/BaseMappings.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/BaseMappings.cs
index b56e7231..5898b53a 100644
--- a/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/BaseMappings.cs
+++ b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/BaseMappings.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using O2NextGen.CertificateManagement.Api.Models.ESender;
 using O2NextGen.ESender.Api.Extensions;
 using O2NextGen.ESender.Business.Models;
+using O2NextGen.Sdk.NetCore.Models.e_sender;
 
 namespace UnitTests.O2NextGen.ESender.Api
 {
diff --git a/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs
index b0cdc0be..92ddc682 100644
--- a/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs
+++ b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
-using O2NextGen.CertificateManagement.Api.Models.ESender;
 using O2NextGen.ESender.Api.Mappings;
 using O2NextGen.ESender.Business.Models;
+using O2NextGen.Sdk.NetCore.Models.e_sender;
 
 namespace UnitTests.O2NextGen.ESender.Api
 {
diff --git a/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/FakeViewModel.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/FakeViewModel.cs
index eab35c08..285de018 100644
--- a/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/FakeViewModel.cs
+++ b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/FakeViewModel.cs
@@ -1,4 +1,4 @@
-using O2NextGen.CertificateManagement.Api.Models.ESender;
+using O2NextGen.Sdk.NetCore.Models.e_sender;
 
 namespace UnitTests.O2NextGen.ESender.Api
 {
diff --git a/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs
index 582ffead..911447d0 100644
--- a/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs
+++ b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using NUnit.Framework;
-using O2NextGen.CertificateManagement.Api.Models.ESender;
 using O2NextGen.ESender.Api.Extensions;
 using O2NextGen.ESender.Business.Models;
 using O2NextGen.ESender.Data.Entities;
 using O2NextGen.ESender.Impl.Mappings;
+using O2NextGen.Sdk.NetCore.Models.e_sender;
 
 namespace UnitTests.O2NextGen.ESender.Impl
 {
diff --git a/src/Services/feedback-x/O2NextGen.FeedBackX.Api/O2NextGen.FeedBackX.Api.csproj b/src/Services/feedback-x/O2NextGen.FeedBackX.Api/O2NextGen.FeedBackX.Api.csproj
index 1f35a2e8..50bdeb58 100644
--- a/src/Services/feedback-x/O2NextGen.FeedBackX.Api/O2NextGen.FeedBackX.Api.csproj
+++ b/src/Services/feedback-x/O2NextGen.FeedBackX.Api/O2NextGen.FeedBackX.Api.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Services/media-basket/O2NextGen.Data/Class1.cs b/src/Services/media-basket/O2NextGen.Data/Class1.cs
deleted file mode 100644
index ff07d190..00000000
--- a/src/Services/media-basket/O2NextGen.Data/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace O2NextGen.Data
-{
-    public class Class1
-    {
-    }
-}
diff --git a/src/Services/media-basket/O2NextGen.Data/O2NextGen.Data.csproj b/src/Services/media-basket/O2NextGen.Data/O2NextGen.Data.csproj
deleted file mode 100644
index 18519397..00000000
--- a/src/Services/media-basket/O2NextGen.Data/O2NextGen.Data.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Controllers/MediaController.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Controllers/MediaController.cs
new file mode 100644
index 00000000..a586807f
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Controllers/MediaController.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using O2NextGen.MediaBasket.Api.Mappings;
+using O2NextGen.MediaBasket.Api.Setup;
+using O2NextGen.MediaBasket.Business.Services;
+using O2NextGen.Sdk.NetCore.Models.media_basket;
+
+namespace O2NextGen.MediaBasket.Api.Controllers
+{
+    [Route("media")]
+    public class MediaController : ControllerBase
+    {
+        #region Fields
+
+        private readonly IMediaService _mediaService;
+        private readonly UrlsConfig _config;
+        private readonly ILogger<MediaController> _logger;
+
+        #endregion
+
+
+        #region Ctors
+
+        public MediaController(IMediaService mediaService, UrlsConfig config,ILogger<MediaController> logger)
+        {
+            _mediaService = mediaService ?? throw new ArgumentException(nameof(mediaService));
+            _config = config ?? throw new ArgumentException(nameof(config));
+            _logger = logger;
+        }
+
+        #endregion
+
+
+        #region Methods
+
+        [HttpGet]
+        [Route("")]
+        public async Task<IActionResult> GetAllAsync()
+        {
+            _logger.LogInformation($"Execute method - {nameof(GetAllAsync)}");
+            var url = _config.Auth;
+            var models = await _mediaService.GetAllAsync(CancellationToken.None);
+            return Ok(models.ToViewModel());
+        }
+
+        [HttpGet]
+        [Route("{id}")]
+        public async Task<IActionResult> GetByIdAsync(long id, CancellationToken ct)
+        {
+            _logger.LogInformation($"Execute method - {nameof(GetByIdAsync)}");
+            var media = await _mediaService.GetByIdAsync(id, ct);
+            if (media == null)
+                return NotFound();
+            return Ok(media.ToViewModel());
+        }
+
+        [HttpPut]
+        [Route("id")]
+        public async Task<IActionResult> UpdateAsync(long id, MediaViewModel model, CancellationToken ct)
+        {
+            _logger.LogInformation($"Execute method - {nameof(UpdateAsync)}");
+            var media = await _mediaService.UpdateAsync(model.ToModel(), ct);
+            return Ok(media.ToViewModel());
+        }
+
+        [HttpPost]
+        [HttpPut]
+        [Route("")]
+        public async Task<IActionResult> AddAsync([FromForm]MediaViewModel model, CancellationToken ct)
+        {
+            _logger.LogInformation($"Execute method - {nameof(AddAsync)}");
+            var media = await _mediaService.AddAsync(model.ToModel(), model.File, ct);
+            return CreatedAtAction(nameof(GetByIdAsync), new {id = media.Id}, media);
+        }
+
+        #endregion
+
+        [HttpDelete]
+        [Route("id")]
+        public async Task<IActionResult> RemoveAsync(long id,CancellationToken ct)
+        {
+            _logger.LogInformation($"Execute method - {nameof(RemoveAsync)}");
+            await _mediaService.RemoveAsync(id, ct);
+            return NoContent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Controllers/VersionController.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Controllers/VersionController.cs
new file mode 100644
index 00000000..9a038c17
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Controllers/VersionController.cs
@@ -0,0 +1,43 @@
+using System.Reflection;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+
+namespace O2NextGen.MediaBasket.Api.Controllers
+{
+
+    [AllowAnonymous]
+    public class VersionController:ControllerBase
+    {
+        #region Fields
+
+        private readonly IHostingEnvironment _environment;
+        private readonly ILogger<VersionController> _logger;
+
+        #endregion
+
+        
+        #region Ctors
+
+        public VersionController(IHostingEnvironment  environment, ILogger<VersionController> logger)
+        {
+            _environment = environment;
+            _logger = logger;
+        }
+
+        #endregion
+
+        [HttpGet("[controller]")]
+        public object Index()
+        {
+            var exVersion = Assembly.GetExecutingAssembly().GetName().Version;
+            _logger.LogInformation($"get version - {exVersion}");
+            return new
+            {
+                Environment = _environment.EnvironmentName,
+                Version = exVersion.ToString()
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Dockerfile b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Dockerfile
new file mode 100644
index 00000000..b25ab4de
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Dockerfile
@@ -0,0 +1,26 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.2 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/core/sdk:2.2 AS build
+WORKDIR /src
+COPY ["Services/media-basket/O2NextGen.MediaBasket.Api/O2NextGen.MediaBasket.Api.csproj", "Services/media-basket/O2NextGen.MediaBasket.Api/"]
+COPY ["Services/media-basket/O2NextGen.MediaBasket.Impl/O2NextGen.MediaBasket.Impl.csproj", "Services/media-basket/O2NextGen.MediaBasket.Impl/"]
+COPY ["Services/media-basket/O2NextGen.MediaBasket.Business/O2NextGen.MediaBasket.Business.csproj", "Services/media-basket/O2NextGen.MediaBasket.Business/"]
+COPY ["Services/media-basket/O2NextGen.MediaBasket.Data/O2NextGen.MediaBasket.Data.csproj", "Services/media-basket/O2NextGen.MediaBasket.Data/"]
+COPY ["SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/O2NextGen.Sdk.NetCore.Models.csproj", "SDKs/O2NG.Sdk.NetCore/O2NG.Sdk.NetCore.Models/"]
+RUN dotnet restore "Services/media-basket/O2NextGen.MediaBasket.Api/O2NextGen.MediaBasket.Api.csproj"
+COPY . .
+WORKDIR "/src/Services/media-basket/O2NextGen.MediaBasket.Api"
+RUN dotnet build "O2NextGen.MediaBasket.Api.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "O2NextGen.MediaBasket.Api.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "O2NextGen.MediaBasket.Api.dll"]
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Filters/ApiExceptionFilter.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Filters/ApiExceptionFilter.cs
new file mode 100644
index 00000000..0be48a28
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Filters/ApiExceptionFilter.cs
@@ -0,0 +1,20 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.EntityFrameworkCore;
+
+namespace O2NextGen.MediaBasket.Api.Filters
+{
+    public class ApiExceptionFilter : IExceptionFilter
+    {
+        public void OnException(ExceptionContext context)
+        {
+            if (context == null) throw new ArgumentNullException(nameof(context));
+            if (context.ExceptionHandled is DbUpdateConcurrencyException)
+            {
+                context.Result =
+                    new ConflictObjectResult(new { Message = "Entity was updated, please refresh your copy." });
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/AccountCloudStorage.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/AccountCloudStorage.cs
new file mode 100644
index 00000000..ef18fbb0
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/AccountCloudStorage.cs
@@ -0,0 +1,16 @@
+namespace O2NextGen.MediaBasket.Api.Helpers
+{
+    public enum StorageType
+    {
+        Cloudinary,
+        Azure
+    }
+    public class AccountCloudStorage
+    {
+        public string AccountName { get; set; } 
+        public  string Container { get; set; }
+        public  string AccountKey { get; set; }
+        public TypeTable TypeTable { get; set; }
+        public StorageType StorageType { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/CloudinarySettings.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/CloudinarySettings.cs
new file mode 100644
index 00000000..5919dd49
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/CloudinarySettings.cs
@@ -0,0 +1,9 @@
+namespace O2NextGen.MediaBasket.Api.Helpers
+{
+    public class CloudinarySettings
+    {
+        public string CloudName { get; set; }
+        public string ApiKey { get; set; }
+        public string ApiSecret { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/ExceptionExtensions.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/ExceptionExtensions.cs
new file mode 100644
index 00000000..b5ce1920
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/ExceptionExtensions.cs
@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Http;
+
+namespace O2NextGen.MediaBasket.Api.Helpers
+{
+    public static class ExceptionExtensions
+    {
+        public static void AddApplicationError(this HttpResponse response, string message)
+        {
+            response.Headers.Add("Application-Error", message);
+            response.Headers.Add("Access-Contol-Expose-Headers", "Application-Error");
+            response.Headers.Add("Access-Control-Allow-Origin", "*");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/FileExt.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/FileExt.cs
new file mode 100644
index 00000000..8423ddd2
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/FileExt.cs
@@ -0,0 +1,10 @@
+namespace O2NextGen.MediaBasket.Api.Helpers
+{
+    public static class FileExt
+    {
+        public static string GetFileExtension(this string fileName)
+        {
+            return System.IO.Path.GetExtension(fileName).ToLower();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/MimeTypes.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/MimeTypes.cs
new file mode 100644
index 00000000..2b23563e
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/MimeTypes.cs
@@ -0,0 +1,597 @@
+using System;
+using System.Collections.Generic;
+
+namespace O2NextGen.MediaBasket.Api.Helpers
+{
+    public static class MimeTypes
+    {
+        private static IDictionary<string, string> _mappings =
+            new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase)
+            {
+                #region Big freaking list of mime types
+
+                // combination of values from Windows 7 Registry and 
+                // from C:\Windows\System32\inetsrv\config\applicationHost.config
+                // some added, including .7z and .dat
+                { ".323", "text/h323" },
+                { ".3g2", "video/3gpp2" },
+                { ".3gp", "video/3gpp" },
+                { ".3gp2", "video/3gpp2" },
+                { ".3gpp", "video/3gpp" },
+                { ".7z", "application/x-7z-compressed" },
+                { ".aa", "audio/audible" },
+                { ".AAC", "audio/aac" },
+                { ".aaf", "application/octet-stream" },
+                { ".aax", "audio/vnd.audible.aax" },
+                { ".ac3", "audio/ac3" },
+                { ".aca", "application/octet-stream" },
+                { ".accda", "application/msaccess.addin" },
+                { ".accdb", "application/msaccess" },
+                { ".accdc", "application/msaccess.cab" },
+                { ".accde", "application/msaccess" },
+                { ".accdr", "application/msaccess.runtime" },
+                { ".accdt", "application/msaccess" },
+                { ".accdw", "application/msaccess.webapplication" },
+                { ".accft", "application/msaccess.ftemplate" },
+                { ".acx", "application/internet-property-stream" },
+                { ".AddIn", "text/xml" },
+                { ".ade", "application/msaccess" },
+                { ".adobebridge", "application/x-bridge-url" },
+                { ".adp", "application/msaccess" },
+                { ".ADT", "audio/vnd.dlna.adts" },
+                { ".ADTS", "audio/aac" },
+                { ".afm", "application/octet-stream" },
+                { ".ai", "application/postscript" },
+                { ".aif", "audio/x-aiff" },
+                { ".aifc", "audio/aiff" },
+                { ".aiff", "audio/aiff" },
+                { ".air", "application/vnd.adobe.air-application-installer-package+zip" },
+                { ".amc", "application/x-mpeg" },
+                { ".application", "application/x-ms-application" },
+                { ".art", "image/x-jg" },
+                { ".asa", "application/xml" },
+                { ".asax", "application/xml" },
+                { ".ascx", "application/xml" },
+                { ".asd", "application/octet-stream" },
+                { ".asf", "video/x-ms-asf" },
+                { ".ashx", "application/xml" },
+                { ".asi", "application/octet-stream" },
+                { ".asm", "text/plain" },
+                { ".asmx", "application/xml" },
+                { ".aspx", "application/xml" },
+                { ".asr", "video/x-ms-asf" },
+                { ".asx", "video/x-ms-asf" },
+                { ".atom", "application/atom+xml" },
+                { ".au", "audio/basic" },
+                { ".avi", "video/x-msvideo" },
+                { ".axs", "application/olescript" },
+                { ".bas", "text/plain" },
+                { ".bcpio", "application/x-bcpio" },
+                { ".bin", "application/octet-stream" },
+                { ".bmp", "image/bmp" },
+                { ".c", "text/plain" },
+                { ".cab", "application/octet-stream" },
+                { ".caf", "audio/x-caf" },
+                { ".calx", "application/vnd.ms-office.calx" },
+                { ".cat", "application/vnd.ms-pki.seccat" },
+                { ".cc", "text/plain" },
+                { ".cd", "text/plain" },
+                { ".cdda", "audio/aiff" },
+                { ".cdf", "application/x-cdf" },
+                { ".cer", "application/x-x509-ca-cert" },
+                { ".chm", "application/octet-stream" },
+                { ".class", "application/x-java-applet" },
+                { ".clp", "application/x-msclip" },
+                { ".cmx", "image/x-cmx" },
+                { ".cnf", "text/plain" },
+                { ".cod", "image/cis-cod" },
+                { ".config", "application/xml" },
+                { ".contact", "text/x-ms-contact" },
+                { ".coverage", "application/xml" },
+                { ".cpio", "application/x-cpio" },
+                { ".cpp", "text/plain" },
+                { ".crd", "application/x-mscardfile" },
+                { ".crl", "application/pkix-crl" },
+                { ".crt", "application/x-x509-ca-cert" },
+                { ".cs", "text/plain" },
+                { ".csdproj", "text/plain" },
+                { ".csh", "application/x-csh" },
+                { ".csproj", "text/plain" },
+                { ".css", "text/css" },
+                { ".csv", "text/csv" },
+                { ".cur", "application/octet-stream" },
+                { ".cxx", "text/plain" },
+                { ".dat", "application/octet-stream" },
+                { ".datasource", "application/xml" },
+                { ".dbproj", "text/plain" },
+                { ".dcr", "application/x-director" },
+                { ".def", "text/plain" },
+                { ".deploy", "application/octet-stream" },
+                { ".der", "application/x-x509-ca-cert" },
+                { ".dgml", "application/xml" },
+                { ".dib", "image/bmp" },
+                { ".dif", "video/x-dv" },
+                { ".dir", "application/x-director" },
+                { ".disco", "text/xml" },
+                { ".dll", "application/x-msdownload" },
+                { ".dll.config", "text/xml" },
+                { ".dlm", "text/dlm" },
+                { ".doc", "application/msword" },
+                { ".docm", "application/vnd.ms-word.document.macroEnabled.12" },
+                { ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document" },
+                { ".dot", "application/msword" },
+                { ".dotm", "application/vnd.ms-word.template.macroEnabled.12" },
+                { ".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template" },
+                { ".dsp", "application/octet-stream" },
+                { ".dsw", "text/plain" },
+                { ".dtd", "text/xml" },
+                { ".dtsConfig", "text/xml" },
+                { ".dv", "video/x-dv" },
+                { ".dvi", "application/x-dvi" },
+                { ".dwf", "drawing/x-dwf" },
+                { ".dwp", "application/octet-stream" },
+                { ".dxr", "application/x-director" },
+                { ".eml", "message/rfc822" },
+                { ".emz", "application/octet-stream" },
+                { ".eot", "application/octet-stream" },
+                { ".eps", "application/postscript" },
+                { ".etl", "application/etl" },
+                { ".etx", "text/x-setext" },
+                { ".evy", "application/envoy" },
+                { ".exe", "application/octet-stream" },
+                { ".exe.config", "text/xml" },
+                { ".fdf", "application/vnd.fdf" },
+                { ".fif", "application/fractals" },
+                { ".filters", "Application/xml" },
+                { ".fla", "application/octet-stream" },
+                { ".flr", "x-world/x-vrml" },
+                { ".flv", "video/x-flv" },
+                { ".fsscript", "application/fsharp-script" },
+                { ".fsx", "application/fsharp-script" },
+                { ".generictest", "application/xml" },
+                { ".gif", "image/gif" },
+                { ".group", "text/x-ms-group" },
+                { ".gsm", "audio/x-gsm" },
+                { ".gtar", "application/x-gtar" },
+                { ".gz", "application/x-gzip" },
+                { ".h", "text/plain" },
+                { ".hdf", "application/x-hdf" },
+                { ".hdml", "text/x-hdml" },
+                { ".hhc", "application/x-oleobject" },
+                { ".hhk", "application/octet-stream" },
+                { ".hhp", "application/octet-stream" },
+                { ".hlp", "application/winhlp" },
+                { ".hpp", "text/plain" },
+                { ".hqx", "application/mac-binhex40" },
+                { ".hta", "application/hta" },
+                { ".htc", "text/x-component" },
+                { ".htm", "text/html" },
+                { ".html", "text/html" },
+                { ".htt", "text/webviewhtml" },
+                { ".hxa", "application/xml" },
+                { ".hxc", "application/xml" },
+                { ".hxd", "application/octet-stream" },
+                { ".hxe", "application/xml" },
+                { ".hxf", "application/xml" },
+                { ".hxh", "application/octet-stream" },
+                { ".hxi", "application/octet-stream" },
+                { ".hxk", "application/xml" },
+                { ".hxq", "application/octet-stream" },
+                { ".hxr", "application/octet-stream" },
+                { ".hxs", "application/octet-stream" },
+                { ".hxt", "text/html" },
+                { ".hxv", "application/xml" },
+                { ".hxw", "application/octet-stream" },
+                { ".hxx", "text/plain" },
+                { ".i", "text/plain" },
+                { ".ico", "image/x-icon" },
+                { ".ics", "application/octet-stream" },
+                { ".idl", "text/plain" },
+                { ".ief", "image/ief" },
+                { ".iii", "application/x-iphone" },
+                { ".inc", "text/plain" },
+                { ".inf", "application/octet-stream" },
+                { ".inl", "text/plain" },
+                { ".ins", "application/x-internet-signup" },
+                { ".ipa", "application/x-itunes-ipa" },
+                { ".ipg", "application/x-itunes-ipg" },
+                { ".ipproj", "text/plain" },
+                { ".ipsw", "application/x-itunes-ipsw" },
+                { ".iqy", "text/x-ms-iqy" },
+                { ".isp", "application/x-internet-signup" },
+                { ".ite", "application/x-itunes-ite" },
+                { ".itlp", "application/x-itunes-itlp" },
+                { ".itms", "application/x-itunes-itms" },
+                { ".itpc", "application/x-itunes-itpc" },
+                { ".IVF", "video/x-ivf" },
+                { ".jar", "application/java-archive" },
+                { ".java", "application/octet-stream" },
+                { ".jck", "application/liquidmotion" },
+                { ".jcz", "application/liquidmotion" },
+                { ".jfif", "image/pjpeg" },
+                { ".jnlp", "application/x-java-jnlp-file" },
+                { ".jpb", "application/octet-stream" },
+                { ".jpe", "image/jpeg" },
+                { ".jpeg", "image/jpeg" },
+                { ".jpg", "image/jpeg" },
+                { ".js", "application/x-javascript" },
+                { ".json", "application/json" },
+                { ".jsx", "text/jscript" },
+                { ".jsxbin", "text/plain" },
+                { ".latex", "application/x-latex" },
+                { ".library-ms", "application/windows-library+xml" },
+                { ".lit", "application/x-ms-reader" },
+                { ".loadtest", "application/xml" },
+                { ".lpk", "application/octet-stream" },
+                { ".lsf", "video/x-la-asf" },
+                { ".lst", "text/plain" },
+                { ".lsx", "video/x-la-asf" },
+                { ".lzh", "application/octet-stream" },
+                { ".m13", "application/x-msmediaview" },
+                { ".m14", "application/x-msmediaview" },
+                { ".m1v", "video/mpeg" },
+                { ".m2t", "video/vnd.dlna.mpeg-tts" },
+                { ".m2ts", "video/vnd.dlna.mpeg-tts" },
+                { ".m2v", "video/mpeg" },
+                { ".m3u", "audio/x-mpegurl" },
+                { ".m3u8", "audio/x-mpegurl" },
+                { ".m4a", "audio/m4a" },
+                { ".m4b", "audio/m4b" },
+                { ".m4p", "audio/m4p" },
+                { ".m4r", "audio/x-m4r" },
+                { ".m4v", "video/x-m4v" },
+                { ".mac", "image/x-macpaint" },
+                { ".mak", "text/plain" },
+                { ".man", "application/x-troff-man" },
+                { ".manifest", "application/x-ms-manifest" },
+                { ".map", "text/plain" },
+                { ".master", "application/xml" },
+                { ".mda", "application/msaccess" },
+                { ".mdb", "application/x-msaccess" },
+                { ".mde", "application/msaccess" },
+                { ".mdp", "application/octet-stream" },
+                { ".me", "application/x-troff-me" },
+                { ".mfp", "application/x-shockwave-flash" },
+                { ".mht", "message/rfc822" },
+                { ".mhtml", "message/rfc822" },
+                { ".mid", "audio/mid" },
+                { ".midi", "audio/mid" },
+                { ".mix", "application/octet-stream" },
+                { ".mk", "text/plain" },
+                { ".mmf", "application/x-smaf" },
+                { ".mno", "text/xml" },
+                { ".mny", "application/x-msmoney" },
+                { ".mod", "video/mpeg" },
+                { ".mov", "video/quicktime" },
+                { ".movie", "video/x-sgi-movie" },
+                { ".mp2", "video/mpeg" },
+                { ".mp2v", "video/mpeg" },
+                { ".mp3", "audio/mpeg" },
+                { ".mp4", "video/mp4" },
+                { ".mp4v", "video/mp4" },
+                { ".mpa", "video/mpeg" },
+                { ".mpe", "video/mpeg" },
+                { ".mpeg", "video/mpeg" },
+                { ".mpf", "application/vnd.ms-mediapackage" },
+                { ".mpg", "video/mpeg" },
+                { ".mpp", "application/vnd.ms-project" },
+                { ".mpv2", "video/mpeg" },
+                { ".mqv", "video/quicktime" },
+                { ".ms", "application/x-troff-ms" },
+                { ".msi", "application/octet-stream" },
+                { ".mso", "application/octet-stream" },
+                { ".mts", "video/vnd.dlna.mpeg-tts" },
+                { ".mtx", "application/xml" },
+                { ".mvb", "application/x-msmediaview" },
+                { ".mvc", "application/x-miva-compiled" },
+                { ".mxp", "application/x-mmxp" },
+                { ".nc", "application/x-netcdf" },
+                { ".nsc", "video/x-ms-asf" },
+                { ".nws", "message/rfc822" },
+                { ".ocx", "application/octet-stream" },
+                { ".oda", "application/oda" },
+                { ".odc", "text/x-ms-odc" },
+                { ".odh", "text/plain" },
+                { ".odl", "text/plain" },
+                { ".odp", "application/vnd.oasis.opendocument.presentation" },
+                { ".ods", "application/oleobject" },
+                { ".odt", "application/vnd.oasis.opendocument.text" },
+                { ".one", "application/onenote" },
+                { ".onea", "application/onenote" },
+                { ".onepkg", "application/onenote" },
+                { ".onetmp", "application/onenote" },
+                { ".onetoc", "application/onenote" },
+                { ".onetoc2", "application/onenote" },
+                { ".orderedtest", "application/xml" },
+                { ".osdx", "application/opensearchdescription+xml" },
+                { ".p10", "application/pkcs10" },
+                { ".p12", "application/x-pkcs12" },
+                { ".p7b", "application/x-pkcs7-certificates" },
+                { ".p7c", "application/pkcs7-mime" },
+                { ".p7m", "application/pkcs7-mime" },
+                { ".p7r", "application/x-pkcs7-certreqresp" },
+                { ".p7s", "application/pkcs7-signature" },
+                { ".pbm", "image/x-portable-bitmap" },
+                { ".pcast", "application/x-podcast" },
+                { ".pct", "image/pict" },
+                { ".pcx", "application/octet-stream" },
+                { ".pcz", "application/octet-stream" },
+                { ".pdf", "application/pdf" },
+                { ".pfb", "application/octet-stream" },
+                { ".pfm", "application/octet-stream" },
+                { ".pfx", "application/x-pkcs12" },
+                { ".pgm", "image/x-portable-graymap" },
+                { ".pic", "image/pict" },
+                { ".pict", "image/pict" },
+                { ".pkgdef", "text/plain" },
+                { ".pkgundef", "text/plain" },
+                { ".pko", "application/vnd.ms-pki.pko" },
+                { ".pls", "audio/scpls" },
+                { ".pma", "application/x-perfmon" },
+                { ".pmc", "application/x-perfmon" },
+                { ".pml", "application/x-perfmon" },
+                { ".pmr", "application/x-perfmon" },
+                { ".pmw", "application/x-perfmon" },
+                { ".png", "image/png" },
+                { ".pnm", "image/x-portable-anymap" },
+                { ".pnt", "image/x-macpaint" },
+                { ".pntg", "image/x-macpaint" },
+                { ".pnz", "image/png" },
+                { ".pot", "application/vnd.ms-powerpoint" },
+                { ".potm", "application/vnd.ms-powerpoint.template.macroEnabled.12" },
+                { ".potx", "application/vnd.openxmlformats-officedocument.presentationml.template" },
+                { ".ppa", "application/vnd.ms-powerpoint" },
+                { ".ppam", "application/vnd.ms-powerpoint.addin.macroEnabled.12" },
+                { ".ppm", "image/x-portable-pixmap" },
+                { ".pps", "application/vnd.ms-powerpoint" },
+                { ".ppsm", "application/vnd.ms-powerpoint.slideshow.macroEnabled.12" },
+                { ".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow" },
+                { ".ppt", "application/vnd.ms-powerpoint" },
+                { ".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12" },
+                { ".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation" },
+                { ".prf", "application/pics-rules" },
+                { ".prm", "application/octet-stream" },
+                { ".prx", "application/octet-stream" },
+                { ".ps", "application/postscript" },
+                { ".psc1", "application/PowerShell" },
+                { ".psd", "application/octet-stream" },
+                { ".psess", "application/xml" },
+                { ".psm", "application/octet-stream" },
+                { ".psp", "application/octet-stream" },
+                { ".pub", "application/x-mspublisher" },
+                { ".pwz", "application/vnd.ms-powerpoint" },
+                { ".qht", "text/x-html-insertion" },
+                { ".qhtm", "text/x-html-insertion" },
+                { ".qt", "video/quicktime" },
+                { ".qti", "image/x-quicktime" },
+                { ".qtif", "image/x-quicktime" },
+                { ".qtl", "application/x-quicktimeplayer" },
+                { ".qxd", "application/octet-stream" },
+                { ".ra", "audio/x-pn-realaudio" },
+                { ".ram", "audio/x-pn-realaudio" },
+                { ".rar", "application/octet-stream" },
+                { ".ras", "image/x-cmu-raster" },
+                { ".rat", "application/rat-file" },
+                { ".rc", "text/plain" },
+                { ".rc2", "text/plain" },
+                { ".rct", "text/plain" },
+                { ".rdlc", "application/xml" },
+                { ".resx", "application/xml" },
+                { ".rf", "image/vnd.rn-realflash" },
+                { ".rgb", "image/x-rgb" },
+                { ".rgs", "text/plain" },
+                { ".rm", "application/vnd.rn-realmedia" },
+                { ".rmi", "audio/mid" },
+                { ".rmp", "application/vnd.rn-rn_music_package" },
+                { ".roff", "application/x-troff" },
+                { ".rpm", "audio/x-pn-realaudio-plugin" },
+                { ".rqy", "text/x-ms-rqy" },
+                { ".rtf", "application/rtf" },
+                { ".rtx", "text/richtext" },
+                { ".ruleset", "application/xml" },
+                { ".s", "text/plain" },
+                { ".safariextz", "application/x-safari-safariextz" },
+                { ".scd", "application/x-msschedule" },
+                { ".sct", "text/scriptlet" },
+                { ".sd2", "audio/x-sd2" },
+                { ".sdp", "application/sdp" },
+                { ".sea", "application/octet-stream" },
+                { ".searchConnector-ms", "application/windows-search-connector+xml" },
+                { ".setpay", "application/set-payment-initiation" },
+                { ".setreg", "application/set-registration-initiation" },
+                { ".settings", "application/xml" },
+                { ".sgimb", "application/x-sgimb" },
+                { ".sgml", "text/sgml" },
+                { ".sh", "application/x-sh" },
+                { ".shar", "application/x-shar" },
+                { ".shtml", "text/html" },
+                { ".sit", "application/x-stuffit" },
+                { ".sitemap", "application/xml" },
+                { ".skin", "application/xml" },
+                { ".sldm", "application/vnd.ms-powerpoint.slide.macroEnabled.12" },
+                { ".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide" },
+                { ".slk", "application/vnd.ms-excel" },
+                { ".sln", "text/plain" },
+                { ".slupkg-ms", "application/x-ms-license" },
+                { ".smd", "audio/x-smd" },
+                { ".smi", "application/octet-stream" },
+                { ".smx", "audio/x-smd" },
+                { ".smz", "audio/x-smd" },
+                { ".snd", "audio/basic" },
+                { ".snippet", "application/xml" },
+                { ".snp", "application/octet-stream" },
+                { ".sol", "text/plain" },
+                { ".sor", "text/plain" },
+                { ".spc", "application/x-pkcs7-certificates" },
+                { ".spl", "application/futuresplash" },
+                { ".src", "application/x-wais-source" },
+                { ".srf", "text/plain" },
+                { ".SSISDeploymentManifest", "text/xml" },
+                { ".ssm", "application/streamingmedia" },
+                { ".sst", "application/vnd.ms-pki.certstore" },
+                { ".stl", "application/vnd.ms-pki.stl" },
+                { ".sv4cpio", "application/x-sv4cpio" },
+                { ".sv4crc", "application/x-sv4crc" },
+                { ".svc", "application/xml" },
+                { ".swf", "application/x-shockwave-flash" },
+                { ".t", "application/x-troff" },
+                { ".tar", "application/x-tar" },
+                { ".tcl", "application/x-tcl" },
+                { ".testrunconfig", "application/xml" },
+                { ".testsettings", "application/xml" },
+                { ".tex", "application/x-tex" },
+                { ".texi", "application/x-texinfo" },
+                { ".texinfo", "application/x-texinfo" },
+                { ".tgz", "application/x-compressed" },
+                { ".thmx", "application/vnd.ms-officetheme" },
+                { ".thn", "application/octet-stream" },
+                { ".tif", "image/tiff" },
+                { ".tiff", "image/tiff" },
+                { ".tlh", "text/plain" },
+                { ".tli", "text/plain" },
+                { ".toc", "application/octet-stream" },
+                { ".tr", "application/x-troff" },
+                { ".trm", "application/x-msterminal" },
+                { ".trx", "application/xml" },
+                { ".ts", "video/vnd.dlna.mpeg-tts" },
+                { ".tsv", "text/tab-separated-values" },
+                { ".ttf", "application/octet-stream" },
+                { ".tts", "video/vnd.dlna.mpeg-tts" },
+                { ".txt", "text/plain" },
+                { ".u32", "application/octet-stream" },
+                { ".uls", "text/iuls" },
+                { ".user", "text/plain" },
+                { ".ustar", "application/x-ustar" },
+                { ".vb", "text/plain" },
+                { ".vbdproj", "text/plain" },
+                { ".vbk", "video/mpeg" },
+                { ".vbproj", "text/plain" },
+                { ".vbs", "text/vbscript" },
+                { ".vcf", "text/x-vcard" },
+                { ".vcproj", "Application/xml" },
+                { ".vcs", "text/plain" },
+                { ".vcxproj", "Application/xml" },
+                { ".vddproj", "text/plain" },
+                { ".vdp", "text/plain" },
+                { ".vdproj", "text/plain" },
+                { ".vdx", "application/vnd.ms-visio.viewer" },
+                { ".vml", "text/xml" },
+                { ".vscontent", "application/xml" },
+                { ".vsct", "text/xml" },
+                { ".vsd", "application/vnd.visio" },
+                { ".vsi", "application/ms-vsi" },
+                { ".vsix", "application/vsix" },
+                { ".vsixlangpack", "text/xml" },
+                { ".vsixmanifest", "text/xml" },
+                { ".vsmdi", "application/xml" },
+                { ".vspscc", "text/plain" },
+                { ".vss", "application/vnd.visio" },
+                { ".vsscc", "text/plain" },
+                { ".vssettings", "text/xml" },
+                { ".vssscc", "text/plain" },
+                { ".vst", "application/vnd.visio" },
+                { ".vstemplate", "text/xml" },
+                { ".vsto", "application/x-ms-vsto" },
+                { ".vsw", "application/vnd.visio" },
+                { ".vsx", "application/vnd.visio" },
+                { ".vtx", "application/vnd.visio" },
+                { ".wav", "audio/wav" },
+                { ".wave", "audio/wav" },
+                { ".wax", "audio/x-ms-wax" },
+                { ".wbk", "application/msword" },
+                { ".wbmp", "image/vnd.wap.wbmp" },
+                { ".wcm", "application/vnd.ms-works" },
+                { ".wdb", "application/vnd.ms-works" },
+                { ".wdp", "image/vnd.ms-photo" },
+                { ".webarchive", "application/x-safari-webarchive" },
+                { ".webtest", "application/xml" },
+                { ".wiq", "application/xml" },
+                { ".wiz", "application/msword" },
+                { ".wks", "application/vnd.ms-works" },
+                { ".WLMP", "application/wlmoviemaker" },
+                { ".wlpginstall", "application/x-wlpg-detect" },
+                { ".wlpginstall3", "application/x-wlpg3-detect" },
+                { ".wm", "video/x-ms-wm" },
+                { ".wma", "audio/x-ms-wma" },
+                { ".wmd", "application/x-ms-wmd" },
+                { ".wmf", "application/x-msmetafile" },
+                { ".wml", "text/vnd.wap.wml" },
+                { ".wmlc", "application/vnd.wap.wmlc" },
+                { ".wmls", "text/vnd.wap.wmlscript" },
+                { ".wmlsc", "application/vnd.wap.wmlscriptc" },
+                { ".wmp", "video/x-ms-wmp" },
+                { ".wmv", "video/x-ms-wmv" },
+                { ".wmx", "video/x-ms-wmx" },
+                { ".wmz", "application/x-ms-wmz" },
+                { ".wpl", "application/vnd.ms-wpl" },
+                { ".wps", "application/vnd.ms-works" },
+                { ".wri", "application/x-mswrite" },
+                { ".wrl", "x-world/x-vrml" },
+                { ".wrz", "x-world/x-vrml" },
+                { ".wsc", "text/scriptlet" },
+                { ".wsdl", "text/xml" },
+                { ".wvx", "video/x-ms-wvx" },
+                { ".x", "application/directx" },
+                { ".xaf", "x-world/x-vrml" },
+                { ".xaml", "application/xaml+xml" },
+                { ".xap", "application/x-silverlight-app" },
+                { ".xbap", "application/x-ms-xbap" },
+                { ".xbm", "image/x-xbitmap" },
+                { ".xdr", "text/plain" },
+                { ".xht", "application/xhtml+xml" },
+                { ".xhtml", "application/xhtml+xml" },
+                { ".xla", "application/vnd.ms-excel" },
+                { ".xlam", "application/vnd.ms-excel.addin.macroEnabled.12" },
+                { ".xlc", "application/vnd.ms-excel" },
+                { ".xld", "application/vnd.ms-excel" },
+                { ".xlk", "application/vnd.ms-excel" },
+                { ".xll", "application/vnd.ms-excel" },
+                { ".xlm", "application/vnd.ms-excel" },
+                { ".xls", "application/vnd.ms-excel" },
+                { ".xlsb", "application/vnd.ms-excel.sheet.binary.macroEnabled.12" },
+                { ".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12" },
+                { ".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" },
+                { ".xlt", "application/vnd.ms-excel" },
+                { ".xltm", "application/vnd.ms-excel.template.macroEnabled.12" },
+                { ".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template" },
+                { ".xlw", "application/vnd.ms-excel" },
+                { ".xml", "text/xml" },
+                { ".xmta", "application/xml" },
+                { ".xof", "x-world/x-vrml" },
+                { ".XOML", "text/plain" },
+                { ".xpm", "image/x-xpixmap" },
+                { ".xps", "application/vnd.ms-xpsdocument" },
+                { ".xrm-ms", "text/xml" },
+                { ".xsc", "application/xml" },
+                { ".xsd", "text/xml" },
+                { ".xsf", "text/xml" },
+                { ".xsl", "text/xml" },
+                { ".xslt", "text/xml" },
+                { ".xsn", "application/octet-stream" },
+                { ".xss", "application/xml" },
+                { ".xtp", "application/octet-stream" },
+                { ".xwd", "image/x-xwindowdump" },
+                { ".z", "application/x-compress" },
+                { ".zip", "application/x-zip-compressed" },
+
+                #endregion
+            };
+
+        public static string GetMimeType(string extension)
+        {
+            if (extension == null)
+            {
+                throw new ArgumentNullException("extension");
+            }
+
+            if (!extension.StartsWith("."))
+            {
+                extension = "." + extension;
+            }
+
+            string mime;
+
+            return _mappings.TryGetValue(extension, out mime) ? mime : "application/octet-stream";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/Singleton.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/Singleton.cs
new file mode 100644
index 00000000..99f87b32
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/Singleton.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Reflection;
+
+namespace O2NextGen.MediaBasket.Api.Helpers
+{
+    public class Singleton<T> where T : class
+    {
+        private static T _instance;
+
+        protected Singleton()
+        {
+        }
+        
+        private static T CreateInstance()
+        {            
+            var cInfo = typeof(T).GetConstructor(
+                BindingFlags.Instance | BindingFlags.NonPublic,
+                null,
+                new Type[0],
+                new ParameterModifier[0]);
+
+            return (T)cInfo.Invoke(null);
+        }
+
+        public static T Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = CreateInstance();
+                }
+
+                return _instance;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/TypeTable.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/TypeTable.cs
new file mode 100644
index 00000000..00708ce7
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Helpers/TypeTable.cs
@@ -0,0 +1,10 @@
+namespace O2NextGen.MediaBasket.Api.Helpers
+{
+    public enum TypeTable
+    {
+        Videos,
+        Certificates,
+        Users,
+        Events
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/IoC/ServiceCollectionExtensions.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/IoC/ServiceCollectionExtensions.cs
new file mode 100644
index 00000000..d08feb8e
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/IoC/ServiceCollectionExtensions.cs
@@ -0,0 +1,62 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using O2NextGen.MediaBasket.Api.Filters;
+using O2NextGen.MediaBasket.Api.Services;
+using O2NextGen.MediaBasket.Business.Services;
+using O2NextGen.MediaBasket.Data;
+using O2NextGen.MediaBasket.Impl.Services;
+
+namespace O2NextGen.MediaBasket.Api.IoC
+{
+    public static class ServiceCollectionExtensions
+    {
+        // ReSharper disable once InconsistentNaming
+        public static TConfig ConfigurePOCO<TConfig>(this IServiceCollection services, IConfiguration configuration)
+            where TConfig : class, new()
+        {
+            if (services == null) 
+                throw new ArgumentNullException(nameof(services));
+            
+            if (configuration == null) 
+                throw new ArgumentNullException(nameof(configuration));
+
+            var config = new TConfig();
+            configuration.Bind(config);
+            services.AddSingleton(config);
+            return config;
+        }
+
+        public static IServiceCollection AddRequiredMvcComponents(this IServiceCollection services)
+        {
+            services.AddTransient<ApiExceptionFilter>();
+
+            var mvcBuilder = services.AddMvcCore(options => { options.Filters.Add<ApiExceptionFilter>(); });
+            mvcBuilder.AddApiExplorer(); //for swagger
+            mvcBuilder.SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            mvcBuilder.AddJsonFormatters();
+            return services;
+        }
+
+        public static IServiceCollection AddConfigEf(this IServiceCollection services, IConfiguration configuration)
+        {
+            var connectionString = configuration["ConnectionString"];
+            services.AddDbContext<MadiaManagementDbContext>(x =>
+                x.UseSqlServer(connectionString));
+            return services;
+        }
+
+        public static IServiceCollection AddBusiness(this IServiceCollection services)
+        {
+            //services.AddSingleton<IMediaService, InMemoryMediaService>();
+            services.AddSingleton<Business.Services.ICloudStorageManager, CloudinaryStorageService>();
+            // Include DataLayer
+            services.AddScoped<IMediaService, MediaService>();
+            //more business services...
+
+            return services;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Logging/ElasticJsonFormatter.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Logging/ElasticJsonFormatter.cs
new file mode 100644
index 00000000..17606749
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Logging/ElasticJsonFormatter.cs
@@ -0,0 +1,103 @@
+using System.IO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using Serilog.Events;
+using Serilog.Formatting;
+using Serilog.Formatting.Json;
+
+namespace O2NextGen.MediaBasket.Api.Logging
+{
+    public class ElasticJsonFormatter : ITextFormatter
+    {
+        private const string Prefix = "[ELASTIC]";
+
+        private readonly NamingStrategy namingStrategy;
+        private readonly JsonValueFormatter formatter;
+        private readonly string type;
+
+        public ElasticJsonFormatter(NamingStrategy namingStrategy, JsonValueFormatter formatter, string type)
+        {
+            this.namingStrategy = namingStrategy;
+            this.formatter = formatter;
+            this.type = type;
+        }
+
+        public ElasticJsonFormatter()
+            : this(new CamelCaseNamingStrategy(), new JsonValueFormatter("$type"), "o2nextgen")
+        {
+        }
+
+        public void Format(LogEvent logEvent, TextWriter output)
+        {
+            output.Write(Prefix);
+            FormatBody(logEvent, output);
+            output.WriteLine();
+        }
+
+        private void FormatBody(LogEvent logEvent, TextWriter output)
+        {
+            // add json body
+            var writer = new JsonTextWriter(output);
+            writer.WriteStartObject();
+
+            // write level
+            writer.WritePropertyName("level");
+            writer.WriteValue(FormatLogLevel(logEvent.Level));
+
+            // write type
+            writer.WritePropertyName("type");
+            writer.WriteValue(type);
+
+            // write timestamp
+            writer.WritePropertyName("timestamp");
+            writer.WriteValue(logEvent.Timestamp.UtcDateTime);
+
+            // write message
+            writer.WritePropertyName("message");
+            writer.WriteValue(logEvent.RenderMessage());
+
+            // write exception if exists
+            if (logEvent.Exception != null)
+            {
+                writer.WritePropertyName("exception");
+                writer.WriteValue(logEvent.Exception.ToString());
+            }
+
+            // write properties
+            writer.WritePropertyName("properties");
+            writer.WriteStartObject();
+            foreach (var property in logEvent.Properties)
+            {
+                var propertyName = namingStrategy.GetPropertyName(property.Key, false);
+                writer.WritePropertyName(propertyName);
+
+                using (var stringWriter = new StringWriter())
+                {
+                    formatter.Format(property.Value, stringWriter);
+                    writer.WriteRawValue(stringWriter.ToString());
+                }
+            }
+
+            writer.WriteEndObject();
+            writer.Flush();
+        }
+
+        private static string FormatLogLevel(LogEventLevel level)
+        {
+            switch (level)
+            {
+                case LogEventLevel.Verbose:
+                    return "TRACE";
+                case LogEventLevel.Debug:
+                    return "DEBUG";
+                case LogEventLevel.Warning:
+                    return "WARNING";
+                case LogEventLevel.Error:
+                case LogEventLevel.Fatal:
+                    return "ERROR";
+                default:
+                    return "INFO";
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Mappings/MediaMappings.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Mappings/MediaMappings.cs
new file mode 100644
index 00000000..4ac9a587
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Mappings/MediaMappings.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using O2NextGen.MediaBasket.Business.Models;
+using O2NextGen.Sdk.NetCore.Models.media_basket;
+
+
+namespace O2NextGen.MediaBasket.Api.Mappings
+{
+    public static class MediaMappings
+    {
+        public static MediaViewModel ToViewModel(this Media model)
+        {
+            if (model == null)
+                return null;
+
+            var viewModel = new MediaViewModel();
+
+            //Bindings
+            viewModel.Id = model.Id;
+            viewModel.Name = model.Name;
+            viewModel.OriginalName = model.OriginalName;
+            viewModel.PublicId = model.PublicId;
+            viewModel.AccountId = model.AccountId;
+            viewModel.ContentType = model.ContentType;
+            viewModel.DateAdded = model.DateAdded;
+            viewModel.Description = model.Description;
+            viewModel.Width = model.Width;
+            viewModel.Height = model.Height;
+            viewModel.ExtType = model.ExtType;
+            viewModel.MediaType = model.MediaType;
+            viewModel.Url = model.Url;
+
+            return viewModel;
+        }
+
+        public static Media ToModel(this MediaViewModel viewModel)
+        {
+            if (viewModel == null)
+                return null;
+
+            var model = new Media();
+
+            //Bindings
+            model.Id = viewModel.Id;
+            model.Name = viewModel.Name;
+            model.OriginalName = viewModel.OriginalName;
+            model.PublicId = viewModel.PublicId;
+            model.AccountId = viewModel.AccountId;
+            model.ContentType = viewModel.ContentType;
+            model.DateAdded = viewModel.DateAdded ?? DateTime.Now;
+            model.Description = viewModel.Description;
+            model.Width = viewModel.Width ?? 0;
+            model.Height = viewModel.Height ?? 0;
+            model.ExtType = viewModel.ExtType;
+            model.MediaType = viewModel.MediaType;
+            model.Url = viewModel.Url;
+
+            return model;
+        }
+
+        public static IReadOnlyCollection<MediaViewModel> ToViewModel(
+            this IReadOnlyCollection<Media> models)
+        {
+            if (models.Count == 0)
+            {
+                return Array.Empty<MediaViewModel>();
+            }
+
+            var subscription = new MediaViewModel[models.Count];
+            var i = 0;
+            foreach (var model in models)
+            {
+                subscription[i] = ToViewModel(model);
+                ++i;
+            }
+
+            return new ReadOnlyCollection<MediaViewModel>(subscription);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/O2NextGen.MediaBasket.Api.csproj b/src/Services/media-basket/O2NextGen.MediaBasket.Api/O2NextGen.MediaBasket.Api.csproj
index c749f877..2ecd8528 100644
--- a/src/Services/media-basket/O2NextGen.MediaBasket.Api/O2NextGen.MediaBasket.Api.csproj
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/O2NextGen.MediaBasket.Api.csproj
@@ -1,17 +1,44 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>netcoreapp2.2</TargetFramework>
+		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+		<UserSecretsId>57dc2d13-9262-45b8-8948-7d0939e33107</UserSecretsId>
+		<DockerfileContext>..\..\..</DockerfileContext>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Content Remove="Properties\launchSettings.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Update="Properties\launchSettings.json">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-</Project>
+	<ItemGroup>
+		<Content Remove="Properties\launchSettings.json" />
+	</ItemGroup>
+	<ItemGroup>
+		<Content Update="Properties\launchSettings.json">
+			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+		</Content>
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.App" />
+		<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0">
+		</PackageReference>
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
+		<PackageReference Include="Serilog.AspNetCore" Version="2.1.1">
+		</PackageReference>
+		<PackageReference Include="Serilog.Settings.Configuration" Version="2.2.0">
+		</PackageReference>
+		<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0">
+		</PackageReference>
+		<PackageReference Include="Serilog.Sinks.Console" Version="2.1.0">
+		</PackageReference>
+		<PackageReference Include="Serilog.Sinks.File" Version="2.2.0">
+		</PackageReference>
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.0" />
+		<PackageReference Include="CloudinaryDotNet" Version="1.3.1" />
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\..\..\SDKs\O2NG.Sdk.NetCore\O2NG.Sdk.NetCore.Models\O2NextGen.Sdk.NetCore.Models.csproj" />
+	  <ProjectReference Include="..\O2NextGen.MediaBasket.Business\O2NextGen.MediaBasket.Business.csproj" />
+	  <ProjectReference Include="..\O2NextGen.MediaBasket.Data\O2NextGen.MediaBasket.Data.csproj" />
+	  <ProjectReference Include="..\O2NextGen.MediaBasket.Impl\O2NextGen.MediaBasket.Impl.csproj" />
+	</ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Program.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Program.cs
index 96eb4471..90130334 100644
--- a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Program.cs
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Program.cs
@@ -1,24 +1,47 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
+using Serilog;
 
 namespace O2NextGen.MediaBasket.Api
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static readonly string Namespace = typeof(Program).Namespace;
+
+        public static readonly string AppName =
+            Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
+
+        public static async Task<int> Main(string[] args)
         {
-            CreateWebHostBuilder(args).Build().Run();
+            try
+            {
+                var host = CreateWebHostBuilder(args).Build();
+                Log.Information($"############### {AppName} ##############");
+                Log.Information("################# Starting Application #################");
+                await host.EnsureDbUpdate();
+                await host.RunAsync();
+                Log.Information($"============== {AppName} - state is started =====================");
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Log.Fatal(ex, "Host terminated unexpectedly");
+                return 1;
+            }
+            finally
+            {
+                Log.CloseAndFlush();
+            }
         }
 
         public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>();
+                .UseSerilog((context, configuration) =>
+                {
+                    configuration.ReadFrom.Configuration(context.Configuration);
+                })
+                .UseStartup<Startup>(); // <- Add this line
     }
-}
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Properties/launchSettings.json b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Properties/launchSettings.json
index bf8115e5..a7ef2502 100644
--- a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Properties/launchSettings.json
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Properties/launchSettings.json
@@ -18,10 +18,17 @@
     "O2NextGen.MediaBasket.Api": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:46897;http://localhost:22944",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "applicationUrl": "https://localhost:46897;http://localhost:22944"
+    },
+    "Docker (1)": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
+      "publishAllPorts": true,
+      "useSSL": true
     }
   }
 }
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Services/AzureStorageService.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Services/AzureStorageService.cs
new file mode 100644
index 00000000..ccd378af
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Services/AzureStorageService.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using O2NextGen.MediaBasket.Business.Models;
+using O2NextGen.MediaBasket.Business.Services;
+
+namespace O2NextGen.MediaBasket.Api.Services
+{
+    public class AzureStorageService : ICloudStorageManager
+    {
+
+        public Task<Media> UploadFileAsync(Media media, IFormFile formFile, CancellationToken ct)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Services/CloudStorage.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Services/CloudStorage.cs
new file mode 100644
index 00000000..9ede1a4d
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Services/CloudStorage.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Linq;
+using O2NextGen.MediaBasket.Api.Helpers;
+
+namespace O2NextGen.MediaBasket.Api.Services
+{
+    public abstract class CloudStorage: Singleton<CloudStorage>
+    {
+        public List<AccountCloudStorage> AccountCloudStorages { get; set; } = new List<AccountCloudStorage>();
+        
+        protected CloudStorage()
+        {
+            Clear();
+        }
+
+        public AccountCloudStorage GetAccountCloudStorage(TypeTable typeTable)
+        {
+            return AccountCloudStorages.Single(x => x.TypeTable == typeTable);
+        }
+
+        public void Clear()
+        {
+            AccountCloudStorages.Clear();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Services/CloudinaryStorageService.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Services/CloudinaryStorageService.cs
new file mode 100644
index 00000000..a98b8487
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Services/CloudinaryStorageService.cs
@@ -0,0 +1,81 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using CloudinaryDotNet;
+using CloudinaryDotNet.Actions;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using O2NextGen.MediaBasket.Api.Helpers;
+using O2NextGen.MediaBasket.Business.Models;
+using O2NextGen.MediaBasket.Business.Services;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats;
+
+namespace O2NextGen.MediaBasket.Api.Services
+{
+    public class CloudinaryStorageService : ICloudStorageManager
+    {
+        private readonly IOptions<CloudinarySettings> _cloudinaryConfig;
+        private readonly ILogger<CloudinaryStorageService> _logger;
+        private readonly Cloudinary _cloudinary;
+
+        public CloudinaryStorageService(IOptions<CloudinarySettings> cloudinaryConfig, ILogger<CloudinaryStorageService> logger)
+        {
+            _cloudinaryConfig = cloudinaryConfig ?? throw new ArgumentException(nameof(cloudinaryConfig));
+            _logger = logger;
+            Account acc = new Account(
+                _cloudinaryConfig.Value.CloudName,
+                _cloudinaryConfig.Value.ApiKey,
+                _cloudinaryConfig.Value.ApiSecret
+            );
+            _cloudinary = new Cloudinary(acc);
+        }
+
+        public async Task<Media> UploadFileAsync(Media media, IFormFile formFile, CancellationToken ct)
+        {
+            if (formFile == null) throw new ArgumentException(nameof(formFile));
+
+            media.OriginalName = formFile.FileName;
+
+            var filename = media.AccountId + "-" + DateTime.UtcNow.ToString("hh/mm/ss/dd/MM/yyyy").Replace('/', '-') +
+                           media.OriginalName.GetFileExtension();
+
+            var contentType = MimeTypes.GetMimeType(filename.GetFileExtension().ToLower());
+
+            if (formFile.Length > 0)
+            {
+                var filePath = Path.GetTempFileName();
+                _logger.LogInformation($"string filePath={filePath}");
+                using (var stream = formFile.OpenReadStream())
+                {
+                    using (Image image = Image.Load(stream, out IImageFormat format))
+                    {
+                        using (var stream2 = formFile.OpenReadStream())
+                        {
+                            // await formFile.CopyToAsync(stream, ct);
+                            var uploadParams = new ImageUploadParams()
+                            {
+                                Folder = "Media-Basket/Dev",
+                                File = new FileDescription(media.OriginalName, stream2),
+                            };
+                            
+                            var uploadResult = _cloudinary.Upload(uploadParams);
+                            media.Name = filename;
+                            media.PublicId = uploadResult.PublicId;
+                            media.Width = image.Width;
+                            media.Height = image.Height;
+                            media.ExtType = filename.GetFileExtension();
+                            media.Url = uploadResult.Uri.ToString();
+                            media.MediaType = "image";
+                            media.ContentType = contentType;
+                        }
+                    }
+                }
+            }
+
+            return await Task.FromResult(media);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Setup/BasicConfiguration.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Setup/BasicConfiguration.cs
new file mode 100644
index 00000000..847fa9ea
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Setup/BasicConfiguration.cs
@@ -0,0 +1,7 @@
+namespace O2NextGen.MediaBasket.Api.Setup
+{
+    public class UrlsConfig
+    {
+        public string  Auth { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Startup.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Startup.cs
index 264dd2c6..5ae47643 100644
--- a/src/Services/media-basket/O2NextGen.MediaBasket.Api/Startup.cs
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/Startup.cs
@@ -1,34 +1,117 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using O2NextGen.MediaBasket.Api.Helpers;
+using O2NextGen.MediaBasket.Api.IoC;
+using O2NextGen.MediaBasket.Api.Services;
+using O2NextGen.MediaBasket.Api.Setup;
+using Serilog;
+using Swashbuckle.AspNetCore.Swagger;
 
 namespace O2NextGen.MediaBasket.Api
 {
     public class Startup
     {
-        // This method gets called by the runtime. Use this method to add services to the container.
-        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
+        public IHostingEnvironment HostingEnvironment { get; private set; }
+        public IConfiguration AppConfiguration { get; private set; }
+
+        public Startup(IConfiguration appConfiguration, IHostingEnvironment env)
+        {
+            this.HostingEnvironment = env;
+            this.AppConfiguration = appConfiguration;
+        }
+
+
+        //private void ConfigureCloudStorageProfile()
+        //{
+
+        //    CloudStorage.Instance.AccountCloudStorages.Add(
+        //        new AccountCloudStorage()
+        //        {
+        //            StorageType = StorageType.Cloudinary,
+        //            AccountName = AppConfiguration.GetSection("CloudStorage:Videos:AccountName").Value,
+        //            Container = AppConfiguration.GetSection("CloudStorage:Videos:Container").Value,
+        //            AccountKey = AppConfiguration.GetSection("CloudStorage:Videos:AccountKey").Value,
+        //            TypeTable = TypeTable.Videos
+        //        });
+
+        //    Log.Information(
+        //        $"CloudStorage:Events:AccountName={AppConfiguration.GetSection("CloudStorage:Videos:AccountName").Value}");
+        //    Log.Information(
+        //        $"CloudStorage:Events:Container={AppConfiguration.GetSection("CloudStorage:Videos:Container").Value}");
+        //    Log.Information(
+        //        $"CloudStorage:Events:AccountKey={AppConfiguration.GetSection("CloudStorage:Videos:AccountKey").Value}");
+        //}
+
         public void ConfigureServices(IServiceCollection services)
         {
+            services.Configure<CloudinarySettings>(AppConfiguration.GetSection("CloudinarySettings"));
+            //ConfigureCloudStorageProfile();
+            services.AddRequiredMvcComponents();
+            services.AddBusiness();
+            services.AddSwaggerGen(options =>
+            {
+                options.DescribeAllEnumsAsStrings();
+                options.SwaggerDoc("v1",new Info()
+                {
+                    Title = "O2NextGen Platform. Media-Basket HTTP API",
+                    Version = "v1",
+                    Description = "Media-Basket API Service. The service allows you to create media files",
+                    TermsOfService = "Terms of Service"
+                });
+            });
+            services.AddConfigEf(AppConfiguration);
+            services.ConfigurePOCO<UrlsConfig>(AppConfiguration.GetSection("Urls"));
         }
 
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
             }
+            else
+            {
+                app.UseExceptionHandler(builder =>
+                {
+                    builder.Run(async context =>
+                    {
+                        context.Response.StatusCode = (int) HttpStatusCode.InternalServerError;
+
+                        var error = context.Features.Get<IExceptionHandlerFeature>();
 
-            app.Run(async (context) =>
+                        if (error != null)
+                        {
+                            context.Response.AddApplicationError(error.Error.Message);
+                            await context.Response.WriteAsync(error.Error.Message);
+                        }
+                    });
+                });
+            }
+            
+            app.UseStaticFiles();
+            app.UseSwagger()
+                .UseSwaggerUI(c =>
+                {
+                    c.SwaggerEndpoint($"/swagger/v1/swagger.json", "Media-Basket API V1");
+                });
+            app.Use(async (context, next) =>
             {
-                await context.Response.WriteAsync("Hello World!");
+                context.Response.OnStarting(() =>
+                {
+                    context.Response.Headers.Add("X-Power-By", "O2NextGen: Media-Basket");
+                    return Task.CompletedTask;
+                });
+
+                await next.Invoke();
             });
+
+            app.UseMvc();
         }
     }
 }
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/StartupHelpers/DatabaseExtensions.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Api/StartupHelpers/DatabaseExtensions.cs
new file mode 100644
index 00000000..c64b57e9
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/StartupHelpers/DatabaseExtensions.cs
@@ -0,0 +1,20 @@
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using O2NextGen.MediaBasket.Data;
+
+// ReSharper disable once CheckNamespace
+namespace Microsoft.AspNetCore.Hosting
+{
+    internal static class DatabaseExtensions
+    {
+        internal static async Task EnsureDbUpdate(this IWebHost host)
+        {
+            using (var scope = host.Services.CreateScope())
+            {
+                var context = scope.ServiceProvider.GetRequiredService<MadiaManagementDbContext>();
+                await context.Database.MigrateAsync();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/appsettings.Development.json b/src/Services/media-basket/O2NextGen.MediaBasket.Api/appsettings.Development.json
new file mode 100644
index 00000000..45fe774a
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Api/appsettings.json b/src/Services/media-basket/O2NextGen.MediaBasket.Api/appsettings.json
new file mode 100644
index 00000000..12873ab5
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Api/appsettings.json
@@ -0,0 +1,38 @@
+{
+  "ConnectionString": "Server=localhost;Initial Catalog=O2NextGen.MediaBasketDb;Persist Security Info=False;User ID=sa;Password=your@Password;Connection Timeout=30;",
+  "Urls": {
+    "Auth": "http://localhost:10001"
+  },
+  "AllowedHosts": "*",
+  "Serilog": {
+    "Enrich": [
+      "FromLogContext"
+    ],
+    "WriteTo": [
+      //{
+      //  "Name": "File",
+      //  "Args": {
+      //    "path": "Logs/log.txt",
+      //    "formatter": "O2NextGen.ESender.Api.Logging.ElasticJsonFormatter, O2NextGen.ESender.Api"
+      //  }
+      //},
+      {
+        "Name": "Console"
+      }
+    ]
+  },
+  "CloudinarySettings": {
+    "CloudName": "cloudname",
+    "ApiKey": "apikey",
+    "ApiSecret": "apisecret"
+  },
+  "Logging": {
+    "IncludeScopes": false,
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Business/Class1.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Business/Class1.cs
deleted file mode 100644
index 9cd4c476..00000000
--- a/src/Services/media-basket/O2NextGen.MediaBasket.Business/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace O2NextGen.MediaBasket.Business
-{
-    public class Class1
-    {
-    }
-}
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Business/Models/Media.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Business/Models/Media.cs
new file mode 100644
index 00000000..00a43ded
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Business/Models/Media.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace O2NextGen.MediaBasket.Business.Models
+{
+    public class Media
+    {
+        public long Id { get; set; }
+        public string Name { get; set; }
+        public string OriginalName { get; set; }
+        public string PublicId { get; set; }
+        public string AccountId { get; set; }
+        public string ContentType { get; set; }
+        public DateTime DateAdded { get; set; }
+        public string Description { get; set; }
+        public int Width { get; set; }
+        public int Height { get; set; }
+        public string ExtType { get; set; }
+        public string Url { get; set; }
+        public string MediaType { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Business/O2NextGen.MediaBasket.Business.csproj b/src/Services/media-basket/O2NextGen.MediaBasket.Business/O2NextGen.MediaBasket.Business.csproj
index 18519397..79d2defe 100644
--- a/src/Services/media-basket/O2NextGen.MediaBasket.Business/O2NextGen.MediaBasket.Business.csproj
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Business/O2NextGen.MediaBasket.Business.csproj
@@ -1,7 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>netcoreapp2.2</TargetFramework>
+	</PropertyGroup>
 
-</Project>
+	<ItemGroup>
+	  <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.2.0" />
+	</ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Business/Services/ICloudStorageManager.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Business/Services/ICloudStorageManager.cs
new file mode 100644
index 00000000..57134140
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Business/Services/ICloudStorageManager.cs
@@ -0,0 +1,13 @@
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using O2NextGen.MediaBasket.Business.Models;
+
+namespace O2NextGen.MediaBasket.Business.Services
+{
+    public interface ICloudStorageManager
+    {
+        Task<Media> UploadFileAsync(Media media, IFormFile formFile, CancellationToken ct);
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Business/Services/IMediaService.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Business/Services/IMediaService.cs
new file mode 100644
index 00000000..b1a1cb27
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Business/Services/IMediaService.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using O2NextGen.MediaBasket.Business.Models;
+
+namespace O2NextGen.MediaBasket.Business.Services
+{
+    public interface IMediaService
+    {
+        Task<IReadOnlyCollection<Media>> GetAllAsync(CancellationToken ct);
+
+        Task<Media> GetByIdAsync(long id, CancellationToken ct);
+
+        Task<Media> UpdateAsync(Media media, CancellationToken ct);
+
+        Task<Media> AddAsync(Media media, IFormFile formFile, CancellationToken ct);
+        
+        Task RemoveAsync(long id, CancellationToken ct);
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Data/Class1.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Class1.cs
deleted file mode 100644
index aaee4f7e..00000000
--- a/src/Services/media-basket/O2NextGen.MediaBasket.Data/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace O2NextGen.MediaBasket.Data
-{
-    public class Class1
-    {
-    }
-}
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Data/Entities/MediaEntity.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Entities/MediaEntity.cs
new file mode 100644
index 00000000..35f3ef0a
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Entities/MediaEntity.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace O2NextGen.MediaBasket.Data.Entities
+{
+    public class MediaEntity
+    {
+        public long Id { get; set; }
+        public string Name { get; set; }
+        public string OriginalName { get; set; }
+        public string PublicId { get; set; }
+        public string AccountId { get; set; }
+        public string ContentType { get; set; }
+        public DateTime? DateAdded { get; set; }
+        public string Description { get; set; }
+        public int Width { get; set; }
+        public int Height { get; set; }
+        public string ExtType { get; set; }
+        public string MediaType { get; set; }
+        public string Url { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Data/MadiaManagementDbContext.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Data/MadiaManagementDbContext.cs
new file mode 100644
index 00000000..c9c2d51c
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Data/MadiaManagementDbContext.cs
@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using O2NextGen.MediaBasket.Data.Entities;
+
+namespace O2NextGen.MediaBasket.Data
+{
+    public class MadiaManagementDbContext : DbContext
+    {
+
+        #region Fields
+
+        public DbSet<MediaEntity> Certificates { get; set; }
+
+        #endregion
+
+        #region Ctors
+
+        public MadiaManagementDbContext(DbContextOptions<MadiaManagementDbContext> options)
+            : base(options)
+        {
+        }
+
+        #endregion
+
+        #region Configure
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            modelBuilder.Entity<MediaEntity>(ConfigureCertificateEntity);
+        }
+
+        private void ConfigureCertificateEntity(EntityTypeBuilder<MediaEntity> builder)
+        {
+            builder.ToTable("Media");
+
+            builder.Property(ci => ci.Id)
+                .HasColumnType("bigint")
+                .ForSqlServerUseSequenceHiLo("media_hilo")
+                .IsRequired();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612061838_InitDatabase.Designer.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612061838_InitDatabase.Designer.cs
new file mode 100644
index 00000000..4db804a1
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612061838_InitDatabase.Designer.cs
@@ -0,0 +1,41 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using O2NextGen.MediaBasket.Data;
+
+namespace O2NextGen.MediaBasket.Data.Migrations
+{
+    [DbContext(typeof(MadiaManagementDbContext))]
+    [Migration("20220612061838_InitDatabase")]
+    partial class InitDatabase
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("Relational:Sequence:.media_hilo", "'media_hilo', '', '1', '10', '', '', 'Int64', 'False'")
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("O2NextGen.MediaBasket.Data.Entities.MediaEntity", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasAnnotation("SqlServer:HiLoSequenceName", "media_hilo")
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.SequenceHiLo);
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Media");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612061838_InitDatabase.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612061838_InitDatabase.cs
new file mode 100644
index 00000000..39d42e8d
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612061838_InitDatabase.cs
@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace O2NextGen.MediaBasket.Data.Migrations
+{
+    public partial class InitDatabase : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateSequence(
+                name: "media_hilo",
+                incrementBy: 10);
+
+            migrationBuilder.CreateTable(
+                name: "Media",
+                columns: table => new
+                {
+                    Id = table.Column<long>(type: "bigint", nullable: false),
+                    Name = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Media", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Media");
+
+            migrationBuilder.DropSequence(
+                name: "media_hilo");
+        }
+    }
+}
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612161450_InitFieldsInDatabase.Designer.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612161450_InitFieldsInDatabase.Designer.cs
new file mode 100644
index 00000000..3a1fc65e
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612161450_InitFieldsInDatabase.Designer.cs
@@ -0,0 +1,64 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using O2NextGen.MediaBasket.Data;
+
+namespace O2NextGen.MediaBasket.Data.Migrations
+{
+    [DbContext(typeof(MadiaManagementDbContext))]
+    [Migration("20220612161450_InitFieldsInDatabase")]
+    partial class InitFieldsInDatabase
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("Relational:Sequence:.media_hilo", "'media_hilo', '', '1', '10', '', '', 'Int64', 'False'")
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("O2NextGen.MediaBasket.Data.Entities.MediaEntity", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasAnnotation("SqlServer:HiLoSequenceName", "media_hilo")
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.SequenceHiLo);
+
+                    b.Property<string>("AccountId");
+
+                    b.Property<string>("ContentType");
+
+                    b.Property<DateTime?>("DateAdded");
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("ExtType");
+
+                    b.Property<int>("Height");
+
+                    b.Property<string>("MediaType");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("OriginalName");
+
+                    b.Property<string>("PublicId");
+
+                    b.Property<string>("Url");
+
+                    b.Property<int>("Width");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Media");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612161450_InitFieldsInDatabase.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612161450_InitFieldsInDatabase.cs
new file mode 100644
index 00000000..8260a56c
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/20220612161450_InitFieldsInDatabase.cs
@@ -0,0 +1,115 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace O2NextGen.MediaBasket.Data.Migrations
+{
+    public partial class InitFieldsInDatabase : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "AccountId",
+                table: "Media",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ContentType",
+                table: "Media",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "DateAdded",
+                table: "Media",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Description",
+                table: "Media",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ExtType",
+                table: "Media",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "Height",
+                table: "Media",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MediaType",
+                table: "Media",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "OriginalName",
+                table: "Media",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PublicId",
+                table: "Media",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Url",
+                table: "Media",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "Width",
+                table: "Media",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AccountId",
+                table: "Media");
+
+            migrationBuilder.DropColumn(
+                name: "ContentType",
+                table: "Media");
+
+            migrationBuilder.DropColumn(
+                name: "DateAdded",
+                table: "Media");
+
+            migrationBuilder.DropColumn(
+                name: "Description",
+                table: "Media");
+
+            migrationBuilder.DropColumn(
+                name: "ExtType",
+                table: "Media");
+
+            migrationBuilder.DropColumn(
+                name: "Height",
+                table: "Media");
+
+            migrationBuilder.DropColumn(
+                name: "MediaType",
+                table: "Media");
+
+            migrationBuilder.DropColumn(
+                name: "OriginalName",
+                table: "Media");
+
+            migrationBuilder.DropColumn(
+                name: "PublicId",
+                table: "Media");
+
+            migrationBuilder.DropColumn(
+                name: "Url",
+                table: "Media");
+
+            migrationBuilder.DropColumn(
+                name: "Width",
+                table: "Media");
+        }
+    }
+}
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/MadiaManagementDbContextModelSnapshot.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/MadiaManagementDbContextModelSnapshot.cs
new file mode 100644
index 00000000..a0b9cb71
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Data/Migrations/MadiaManagementDbContextModelSnapshot.cs
@@ -0,0 +1,62 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using O2NextGen.MediaBasket.Data;
+
+namespace O2NextGen.MediaBasket.Data.Migrations
+{
+    [DbContext(typeof(MadiaManagementDbContext))]
+    partial class MadiaManagementDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("Relational:Sequence:.media_hilo", "'media_hilo', '', '1', '10', '', '', 'Int64', 'False'")
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("O2NextGen.MediaBasket.Data.Entities.MediaEntity", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint")
+                        .HasAnnotation("SqlServer:HiLoSequenceName", "media_hilo")
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.SequenceHiLo);
+
+                    b.Property<string>("AccountId");
+
+                    b.Property<string>("ContentType");
+
+                    b.Property<DateTime?>("DateAdded");
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("ExtType");
+
+                    b.Property<int>("Height");
+
+                    b.Property<string>("MediaType");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("OriginalName");
+
+                    b.Property<string>("PublicId");
+
+                    b.Property<string>("Url");
+
+                    b.Property<int>("Width");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Media");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Data/O2NextGen.MediaBasket.Data.csproj b/src/Services/media-basket/O2NextGen.MediaBasket.Data/O2NextGen.MediaBasket.Data.csproj
index 18519397..2dd0273b 100644
--- a/src/Services/media-basket/O2NextGen.MediaBasket.Data/O2NextGen.MediaBasket.Data.csproj
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Data/O2NextGen.MediaBasket.Data.csproj
@@ -1,7 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-  </PropertyGroup>
-
-</Project>
+	<PropertyGroup>
+		<TargetFramework>netcoreapp2.2</TargetFramework>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.1">
+		</PackageReference>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1">
+		</PackageReference>
+	</ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Class1.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Class1.cs
deleted file mode 100644
index ff7f0819..00000000
--- a/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace O2NextGen.MediaBasket.Impl
-{
-    public class Class1
-    {
-    }
-}
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Mappings/MappingExtensions.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Mappings/MappingExtensions.cs
new file mode 100644
index 00000000..49e25ab4
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Mappings/MappingExtensions.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace O2NextGen.MediaBasket.Impl.Mappings
+{
+    internal static class MappingExtensions
+    {
+        public static IReadOnlyCollection<TOut> MapCollection<TIn, TOut>(this IReadOnlyCollection<TIn> input,
+            Func<TIn, TOut> mapper)
+        {
+            if (mapper is null)
+            {
+                throw new ArgumentNullException(nameof(mapper));
+            }
+
+            if (input is null || input.Count == 0)
+            {
+                return Array.Empty<TOut>();
+            }
+
+            var output = new TOut[input.Count];
+            var i = 0;
+            foreach (var entity in input)
+            {
+                output[i] = mapper(entity);
+                i++;
+            }
+
+            return new ReadOnlyCollection<TOut>(output);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Mappings/MediaMappings.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Mappings/MediaMappings.cs
new file mode 100644
index 00000000..806d56da
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Mappings/MediaMappings.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using O2NextGen.MediaBasket.Business.Models;
+using O2NextGen.MediaBasket.Data.Entities;
+
+namespace O2NextGen.MediaBasket.Impl.Mappings
+{
+    internal static class MediaMappings
+    {
+        public static Media ToService(this MediaEntity entity)
+        {
+            return entity != null
+                ? new Media()
+                {
+                    Id = entity.Id,
+                    Name = entity.Name,
+                    OriginalName = entity.OriginalName,
+                    PublicId = entity.PublicId,
+                    AccountId = entity.AccountId,
+                    ContentType = entity.ContentType,
+                    DateAdded = entity.DateAdded ?? DateTime.Now,
+                    Description = entity.Description,
+                    Width = entity.Width,
+                    Height = entity.Height,
+                    ExtType = entity.ExtType,
+                    MediaType = entity.MediaType,
+                    Url = entity.Url,
+                }
+                : null;
+        }
+
+        public static MediaEntity ToEntity(this Media model)
+        {
+            return model != null
+                ? new MediaEntity()
+                {
+                    Id = model.Id,
+                    Name = model.Name,
+                    OriginalName = model.OriginalName,
+                    PublicId = model.PublicId,
+                    AccountId = model.AccountId,
+                    ContentType = model.ContentType,
+                    DateAdded = model.DateAdded,
+                    Description = model.Description,
+                    Width = model.Width,
+                    Height = model.Height,
+                    ExtType = model.ExtType,
+                    MediaType = model.MediaType,
+                    Url = model.Url,
+                }
+                : null;
+        }
+
+        public static IReadOnlyCollection<Media>
+            ToService(this IReadOnlyCollection<MediaEntity> entities) =>
+            entities.MapCollection(ToService);
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Impl/O2NextGen.MediaBasket.Impl.csproj b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/O2NextGen.MediaBasket.Impl.csproj
index 18519397..d8112c49 100644
--- a/src/Services/media-basket/O2NextGen.MediaBasket.Impl/O2NextGen.MediaBasket.Impl.csproj
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/O2NextGen.MediaBasket.Impl.csproj
@@ -1,7 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>netcoreapp2.2</TargetFramework>
+	</PropertyGroup>
 
-</Project>
+	<ItemGroup>
+		<ProjectReference Include="..\O2NextGen.MediaBasket.Business\O2NextGen.MediaBasket.Business.csproj" />
+		<ProjectReference Include="..\O2NextGen.MediaBasket.Data\O2NextGen.MediaBasket.Data.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="SixLabors.ImageSharp" Version="1.0.2" />
+	</ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Services/InMemoryMediaService.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Services/InMemoryMediaService.cs
new file mode 100644
index 00000000..b85552f4
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Services/InMemoryMediaService.cs
@@ -0,0 +1,79 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using O2NextGen.MediaBasket.Business.Models;
+using O2NextGen.MediaBasket.Business.Services;
+
+namespace O2NextGen.MediaBasket.Impl.Services
+{
+    public class InMemoryMediaService : IMediaService
+    {
+        #region Fields
+        private readonly ICloudStorageManager _cloudStorage;
+
+        private static readonly List<Media> Certificates = new List<Media>()
+        {
+            new Media()
+            {
+                Id = 1, Name = "First"
+            }
+        };
+        private long _currentId;
+
+        #endregion
+
+        #region Ctors
+
+        public InMemoryMediaService(ICloudStorageManager cloudStorage)
+        {
+            _cloudStorage = cloudStorage;
+            _currentId = Certificates.Count();
+        }
+        #endregion
+
+        #region Methods
+        public async Task<IReadOnlyCollection<Media>> GetAllAsync(CancellationToken ct)
+        {
+            await Task.Delay(3000, ct);
+            return await Task.FromResult<IReadOnlyCollection<Media>>(Certificates.AsReadOnly());
+        }
+
+        public async Task<Media> GetByIdAsync(long id, CancellationToken ct)
+        {
+            await Task.Delay(3000, ct);
+            return await Task.FromResult(Certificates.SingleOrDefault(g => g.Id == id));
+        }
+
+        public async Task<Media> UpdateAsync(Media media, CancellationToken ct)
+        {
+            await Task.Delay(5000, ct);
+            var toUpdate = Certificates.SingleOrDefault(g => g.Id == media.Id);
+            if (toUpdate == null)
+                return null;
+
+            toUpdate.Name = media.Name;
+
+            return await Task.FromResult(toUpdate);
+        }
+
+        public async Task<Media> AddAsync(Media media, IFormFile formFile, CancellationToken ct)
+        {
+            await Task.Delay(3000, ct);
+            media.Id = ++_currentId;
+            await _cloudStorage.UploadFileAsync(media, formFile, ct);
+            Certificates.Add(media);
+            return await Task.FromResult(media);
+        }
+
+
+        public Task RemoveAsync(long id, CancellationToken ct)
+        {
+            throw new System.NotImplementedException();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Services/MediaService.cs b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Services/MediaService.cs
new file mode 100644
index 00000000..39436b30
--- /dev/null
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.Impl/Services/MediaService.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+using O2NextGen.MediaBasket.Business.Models;
+using O2NextGen.MediaBasket.Business.Services;
+using O2NextGen.MediaBasket.Data;
+using O2NextGen.MediaBasket.Impl.Mappings;
+
+namespace O2NextGen.MediaBasket.Impl.Services
+{
+    public class MediaService : IMediaService
+    {
+        #region Fields
+
+        private readonly MadiaManagementDbContext _context;
+        private readonly ICloudStorageManager _cloudStorage;
+
+        #endregion
+
+
+        #region Ctors
+
+        public MediaService(MadiaManagementDbContext context,ICloudStorageManager cloudStorage)
+        {
+            _context = context;
+            _cloudStorage = cloudStorage;
+        }
+
+        #endregion
+
+        public async Task<IReadOnlyCollection<Media>> GetAllAsync(CancellationToken ct)
+        {
+            var certificates = await _context.Certificates.AsNoTracking().OrderBy(_=>_.Id).ToListAsync();
+            return certificates.ToService();
+        }
+
+        public async Task<Media> GetByIdAsync(long id, CancellationToken ct)
+        {
+            var certificates = await _context.Certificates.AsNoTracking().SingleAsync(x => x.Id == id, ct);
+            return certificates.ToService();
+        }
+
+        public async Task<Media> UpdateAsync(Media media, CancellationToken ct)
+        {
+            var updatedCertificateEntity = _context.Certificates.Update(media.ToEntity());
+            await _context.SaveChangesAsync(ct);
+            return updatedCertificateEntity.Entity.ToService();
+        }
+        
+        public async Task<Media> AddAsync(Media media, IFormFile formFile, CancellationToken ct)
+        {
+            await _cloudStorage.UploadFileAsync(media, formFile, ct);
+            var addedCertificateEntity = await _context.Certificates.AddAsync(media.ToEntity(), ct);
+            await _context.SaveChangesAsync(ct);
+            return addedCertificateEntity.Entity.ToService();
+        }
+
+        public async Task RemoveAsync(long id, CancellationToken ct)
+        {
+            var entityToRemove = await _context.Certificates.SingleOrDefaultAsync(_ => _.Id == id, ct);
+            _context.Certificates.Remove(entityToRemove);
+            await _context.SaveChangesAsync(ct);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Services/media-basket/O2NextGen.MediaBasket.sln b/src/Services/media-basket/O2NextGen.MediaBasket.sln
index 23607cb7..b188d993 100644
--- a/src/Services/media-basket/O2NextGen.MediaBasket.sln
+++ b/src/Services/media-basket/O2NextGen.MediaBasket.sln
@@ -1,27 +1,31 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.810.22
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32421.90
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.MediaBasket.Business", "O2NextGen.MediaBasket.Business\O2NextGen.MediaBasket.Business.csproj", "{3727C1D6-F1F9-4962-A64B-0872A7A3B676}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.MediaBasket.Business", "O2NextGen.MediaBasket.Business\O2NextGen.MediaBasket.Business.csproj", "{3727C1D6-F1F9-4962-A64B-0872A7A3B676}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.MediaBasket.Data", "O2NextGen.MediaBasket.Data\O2NextGen.MediaBasket.Data.csproj", "{3A00AD20-30FF-4D54-A25E-E9A16EB78E23}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.MediaBasket.Data", "O2NextGen.MediaBasket.Data\O2NextGen.MediaBasket.Data.csproj", "{3A00AD20-30FF-4D54-A25E-E9A16EB78E23}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.MediaBasket.Impl", "O2NextGen.MediaBasket.Impl\O2NextGen.MediaBasket.Impl.csproj", "{6BAA3FD6-0238-4304-ADED-FF740259CDC2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.MediaBasket.Impl", "O2NextGen.MediaBasket.Impl\O2NextGen.MediaBasket.Impl.csproj", "{6BAA3FD6-0238-4304-ADED-FF740259CDC2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5A1D96AD-2969-4FAB-84E5-6AE8DB9A6EE9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.O2NextGen.MediaBasket.Api", "Tests\IntegrationTests.O2NextGen.MediaBasket.Api\IntegrationTests.O2NextGen.MediaBasket.Api.csproj", "{C4D95994-E49E-4A29-B70C-E7A39944567F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests.O2NextGen.MediaBasket.Api", "Tests\IntegrationTests.O2NextGen.MediaBasket.Api\IntegrationTests.O2NextGen.MediaBasket.Api.csproj", "{C4D95994-E49E-4A29-B70C-E7A39944567F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.MediaBasket.Api", "Tests\Tests.O2NextGen.MediaBasket.Api\Tests.O2NextGen.MediaBasket.Api.csproj", "{663A3ECF-F27B-4042-AF25-53A6325627DC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.O2NextGen.MediaBasket.Api", "Tests\Tests.O2NextGen.MediaBasket.Api\Tests.O2NextGen.MediaBasket.Api.csproj", "{663A3ECF-F27B-4042-AF25-53A6325627DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.MediaBasket.Business", "Tests\Tests.O2NextGen.MediaBasket.Business\Tests.O2NextGen.MediaBasket.Business.csproj", "{4D1B161E-A330-48D2-8E5E-5BEE5364F763}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.O2NextGen.MediaBasket.Business", "Tests\Tests.O2NextGen.MediaBasket.Business\Tests.O2NextGen.MediaBasket.Business.csproj", "{4D1B161E-A330-48D2-8E5E-5BEE5364F763}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.MediaBasket.Impl", "Tests\Tests.O2NextGen.MediaBasket.Impl\Tests.O2NextGen.MediaBasket.Impl.csproj", "{1E7EF124-6FA0-43C4-9E65-334A260F1FC2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.O2NextGen.MediaBasket.Impl", "Tests\Tests.O2NextGen.MediaBasket.Impl\Tests.O2NextGen.MediaBasket.Impl.csproj", "{1E7EF124-6FA0-43C4-9E65-334A260F1FC2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.MediaBasket.Data", "Tests\Tests.O2NextGen.MediaBasket.Data\Tests.O2NextGen.MediaBasket.Data.csproj", "{F3575828-D497-4253-9D1E-1AEC59337374}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.O2NextGen.MediaBasket.Data", "Tests\Tests.O2NextGen.MediaBasket.Data\Tests.O2NextGen.MediaBasket.Data.csproj", "{F3575828-D497-4253-9D1E-1AEC59337374}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.MediaBasket.Api", "O2NextGen.MediaBasket.Api\O2NextGen.MediaBasket.Api.csproj", "{C7D33544-5C61-4A40-9195-27703CD33049}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.MediaBasket.Api", "O2NextGen.MediaBasket.Api\O2NextGen.MediaBasket.Api.csproj", "{C7D33544-5C61-4A40-9195-27703CD33049}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDKs", "SDKs", "{2FA2DC85-EE07-41FE-8CD6-CB016ACE141E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "O2NextGen.Sdk.NetCore.Models", "..\..\SDKs\O2NG.Sdk.NetCore\O2NG.Sdk.NetCore.Models\O2NextGen.Sdk.NetCore.Models.csproj", "{57AEE30D-702C-4E47-8754-99DE9FB7E5F9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -65,18 +69,23 @@ Global
 		{C7D33544-5C61-4A40-9195-27703CD33049}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C7D33544-5C61-4A40-9195-27703CD33049}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C7D33544-5C61-4A40-9195-27703CD33049}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57AEE30D-702C-4E47-8754-99DE9FB7E5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57AEE30D-702C-4E47-8754-99DE9FB7E5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57AEE30D-702C-4E47-8754-99DE9FB7E5F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57AEE30D-702C-4E47-8754-99DE9FB7E5F9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B5DE36A5-6E5E-4E49-9F59-BD35AF1461BE}
-	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{C4D95994-E49E-4A29-B70C-E7A39944567F} = {5A1D96AD-2969-4FAB-84E5-6AE8DB9A6EE9}
 		{663A3ECF-F27B-4042-AF25-53A6325627DC} = {5A1D96AD-2969-4FAB-84E5-6AE8DB9A6EE9}
 		{4D1B161E-A330-48D2-8E5E-5BEE5364F763} = {5A1D96AD-2969-4FAB-84E5-6AE8DB9A6EE9}
 		{1E7EF124-6FA0-43C4-9E65-334A260F1FC2} = {5A1D96AD-2969-4FAB-84E5-6AE8DB9A6EE9}
 		{F3575828-D497-4253-9D1E-1AEC59337374} = {5A1D96AD-2969-4FAB-84E5-6AE8DB9A6EE9}
+		{57AEE30D-702C-4E47-8754-99DE9FB7E5F9} = {2FA2DC85-EE07-41FE-8CD6-CB016ACE141E}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B5DE36A5-6E5E-4E49-9F59-BD35AF1461BE}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Services/media-basket/Tests/IntegrationTests.O2NextGen.MediaBasket.Api/UnitTest1.cs b/src/Services/media-basket/Tests/IntegrationTests.O2NextGen.MediaBasket.Api/UnitTest1.cs
index 2af90da9..ffb617ee 100644
--- a/src/Services/media-basket/Tests/IntegrationTests.O2NextGen.MediaBasket.Api/UnitTest1.cs
+++ b/src/Services/media-basket/Tests/IntegrationTests.O2NextGen.MediaBasket.Api/UnitTest1.cs
@@ -1,5 +1,4 @@
-using System;
-using Xunit;
+using Xunit;
 
 namespace IntegrationTests.O2NextGen.MediaBasket.Api
 {
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs
index 2cf7d9f6..d0fd1596 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Mvc;
 using O2NextGen.Tracker.DbUtility;
 
-namespace O2NetGen.OnTracker.Api.Controllers
+namespace O2NextGen.OnTracker.Api.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/IoC/ServiceCollectionExtensions.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/IoC/ServiceCollectionExtensions.cs
index 3db79168..ef51ea85 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/IoC/ServiceCollectionExtensions.cs
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/IoC/ServiceCollectionExtensions.cs
@@ -3,7 +3,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace O2NetGen.OnTracker.Api.IoC
+namespace O2NextGen.OnTracker.Api.IoC
 {
     public static class ServiceCollectionExtensions
     {
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/MaxMindLocalGeoIpAddressResolver.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/MaxMindLocalGeoIpAddressResolver.cs
index c518c8d2..bc09d440 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/MaxMindLocalGeoIpAddressResolver.cs
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/MaxMindLocalGeoIpAddressResolver.cs
@@ -4,10 +4,10 @@
 using System.Net;
 using System.Reflection;
 using MaxMind.Db;
-using O2NetGen.OnTracker.Api.Setup;
+using O2NextGen.OnTracker.Api.Setup;
 using O2NextGen.Tracker.DbUtility;
 
-namespace O2NetGen.OnTracker.Api
+namespace O2NextGen.OnTracker.Api
 {
     public sealed class MaxMindLocalGeoIpAddressResolver : IGeoIpAddressResolver
     {
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj
index 80014d9b..c37f54b5 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Program.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Program.cs
index e25d3990..a284c6d2 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Program.cs
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Program.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
-namespace O2NetGen.OnTracker.Api
+namespace O2NextGen.OnTracker.Api
 {
     public class Program
     {
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Setup/GeoDatabase.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Setup/GeoDatabase.cs
index f3fc032a..42a21691 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Setup/GeoDatabase.cs
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Setup/GeoDatabase.cs
@@ -1,4 +1,4 @@
-namespace O2NetGen.OnTracker.Api.Setup
+namespace O2NextGen.OnTracker.Api.Setup
 {
     public class GeoDatabase
     {
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs
index c4dec083..31e6eaf2 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs
@@ -2,12 +2,12 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using O2NetGen.OnTracker.Api.IoC;
-using O2NetGen.OnTracker.Api.Setup;
+using O2NextGen.OnTracker.Api.IoC;
+using O2NextGen.OnTracker.Api.Setup;
 using O2NextGen.Tracker.DbUtility;
 using Swashbuckle.AspNetCore.Swagger;
 
-namespace O2NetGen.OnTracker.Api
+namespace O2NextGen.OnTracker.Api
 {
     public class Startup
     {
diff --git a/src/Services/s-link/O2NextGen.SLink.Api/O2NextGen.SLink.Api.csproj b/src/Services/s-link/O2NextGen.SLink.Api/O2NextGen.SLink.Api.csproj
index 2f8a0d68..94cfad5e 100644
--- a/src/Services/s-link/O2NextGen.SLink.Api/O2NextGen.SLink.Api.csproj
+++ b/src/Services/s-link/O2NextGen.SLink.Api/O2NextGen.SLink.Api.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Controllers/ChatController.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Controllers/ChatController.cs
index 257ed1ca..44b52547 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Controllers/ChatController.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Controllers/ChatController.cs
@@ -10,7 +10,7 @@
 using System.Threading.Tasks;
 using MassTransit;
 using Microsoft.AspNetCore.Authorization;
-using O2NextGen.Common;
+using O2NextGen.SmallTalk.Api.Messaging;
 
 namespace O2NextGen.SmallTalk.Api.Controllers
 {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Helpers/ServiceCollectionExtensions.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Helpers/ServiceCollectionExtensions.cs
index 553a7419..a6bce19c 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Helpers/ServiceCollectionExtensions.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Helpers/ServiceCollectionExtensions.cs
@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using O2NextGen.SmallTalk.Api.Services;
 using O2NextGen.SmallTalk.Business.Services;
 using O2NextGen.SmallTalk.Impl.Services;
 using System;
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Messaging/SendMessageCompletedEvent.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Messaging/SendMessageCompletedEvent.cs
index 53ba6a31..d6f260a5 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Messaging/SendMessageCompletedEvent.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Messaging/SendMessageCompletedEvent.cs
@@ -1,4 +1,4 @@
-namespace O2NextGen.Common
+namespace O2NextGen.SmallTalk.Api.Messaging
 {
     public class SendMessageCompletedEvent
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/O2NextGen.SmallTalk.Api.csproj b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/O2NextGen.SmallTalk.Api.csproj
index 11923b9c..4f32940c 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/O2NextGen.SmallTalk.Api.csproj
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/O2NextGen.SmallTalk.Api.csproj
@@ -24,7 +24,7 @@
 		<PackageReference Include="Microsoft.Extensions.Http.Polly">
 			<Version>2.2.0</Version>
 		</PackageReference>
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Startup.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Startup.cs
index 22e09b7d..29cf02c5 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Startup.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Api/Startup.cs
@@ -15,7 +15,6 @@
 using MassTransit;
 using MassTransit.Util;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using RabbitMQ.Client;
 using Swashbuckle.AspNetCore.Swagger;
 
 namespace O2NextGen.SmallTalk.Api
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Models/SessionModel.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Models/SessionModel.cs
index 29c87bd3..813f9716 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Models/SessionModel.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Models/SessionModel.cs
@@ -1,4 +1,4 @@
-namespace O2NextGen.SmallTalk.Api.Models
+namespace O2NextGen.SmallTalk.Business.Models
 {
     public class SessionModel
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IAccessManager.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IAccessManager.cs
index 321263d0..71337d09 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IAccessManager.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IAccessManager.cs
@@ -1,4 +1,4 @@
-namespace O2NextGen.SmallTalk.Api.Services
+namespace O2NextGen.SmallTalk.Business.Services
 {
     public interface IAccessManager
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IChatService.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IChatService.cs
index 1b9de146..3a1ad8c9 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IChatService.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IChatService.cs
@@ -1,9 +1,9 @@
-using O2NextGen.SmallTalk.Business.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using O2NextGen.SmallTalk.Business.Models;
 
-namespace O2NextGen.SmallTalk.Api.Services
+namespace O2NextGen.SmallTalk.Business.Services
 {
     public interface IChatService
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/ICustomerManager.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/ICustomerManager.cs
index b5d8b5ff..106de529 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/ICustomerManager.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/ICustomerManager.cs
@@ -1,4 +1,4 @@
-namespace O2NextGen.SmallTalk.Api.Services
+namespace O2NextGen.SmallTalk.Business.Services
 {
     public interface ICustomerManager
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/ISessionManager.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/ISessionManager.cs
index 5a1f299e..ba6c1618 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/ISessionManager.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/ISessionManager.cs
@@ -1,9 +1,9 @@
-using O2NextGen.SmallTalk.Business.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using O2NextGen.SmallTalk.Business.Models;
 
-namespace O2NextGen.SmallTalk.Api.Services
+namespace O2NextGen.SmallTalk.Business.Services
 {
     public interface ISessionManager
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IUserManager.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IUserManager.cs
index 073d0261..ddea7382 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IUserManager.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Business/Services/IUserManager.cs
@@ -1,4 +1,4 @@
-namespace O2NextGen.SmallTalk.Api.Services
+namespace O2NextGen.SmallTalk.Business.Services
 {
     public interface IUserManager
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/ChatManager.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/ChatManager.cs
index 8e96c2bb..88937fbe 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/ChatManager.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/ChatManager.cs
@@ -1,5 +1,4 @@
-using O2NextGen.SmallTalk.Api.Services;
-using O2NextGen.SmallTalk.Business.Models;
+using O2NextGen.SmallTalk.Business.Models;
 using O2NextGen.SmallTalk.Business.Services;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/InMemoryChatService.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/InMemoryChatService.cs
index 6c60c218..aef32c84 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/InMemoryChatService.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/InMemoryChatService.cs
@@ -1,10 +1,11 @@
-using O2NextGen.SmallTalk.Business.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using O2NextGen.SmallTalk.Business.Models;
+using O2NextGen.SmallTalk.Business.Services;
 
-namespace O2NextGen.SmallTalk.Api.Services
+namespace O2NextGen.SmallTalk.Impl.Services
 {
 
     public class InMemoryChatService : IChatService
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/InMemorySessionManager.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/InMemorySessionManager.cs
index 19341dcb..ad6a7a3a 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/InMemorySessionManager.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.Impl/Services/InMemorySessionManager.cs
@@ -1,10 +1,11 @@
-using O2NextGen.SmallTalk.Business.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using O2NextGen.SmallTalk.Business.Models;
+using O2NextGen.SmallTalk.Business.Services;
 
-namespace O2NextGen.SmallTalk.Api.Services
+namespace O2NextGen.SmallTalk.Impl.Services
 {
     public class InMemorySessionManager : ISessionManager
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Controllers/ChatController.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Controllers/ChatController.cs
index 65dd604a..d1433534 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Controllers/ChatController.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Controllers/ChatController.cs
@@ -3,7 +3,6 @@
 using O2NextGen.SmallTalk.SignalrHub.Hubs;
 using System.Threading.Tasks;
 using MassTransit;
-using O2NextGen.Common;
 
 namespace O2NextGen.SmallTalk.SignalrHub.Controllers
 {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Hubs/ChatHub.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Hubs/ChatHub.cs
index 50bdfb88..cde0c629 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Hubs/ChatHub.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Hubs/ChatHub.cs
@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.SignalR;
 using System;
-using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/Consumers/OnlineStatusCompletedEventConsumer.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/Consumers/OnlineStatusCompletedEventConsumer.cs
index 9fb8044b..02276045 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/Consumers/OnlineStatusCompletedEventConsumer.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/Consumers/OnlineStatusCompletedEventConsumer.cs
@@ -3,7 +3,7 @@
 using Microsoft.AspNetCore.SignalR;
 using O2NextGen.SmallTalk.SignalrHub.Hubs;
 
-namespace O2NextGen.Common.Consumers
+namespace O2NextGen.SmallTalk.SignalrHub.Messaging.Consumers
 {
     public class OnlineStatusCompletedEventConsumer:IConsumer<OnlineStatusCompletedEvent>
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/Consumers/SendMessageCompletedEventConsumer.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/Consumers/SendMessageCompletedEventConsumer.cs
index dd6f9bf4..534fe170 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/Consumers/SendMessageCompletedEventConsumer.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/Consumers/SendMessageCompletedEventConsumer.cs
@@ -3,7 +3,7 @@
 using Microsoft.AspNetCore.SignalR;
 using O2NextGen.SmallTalk.SignalrHub.Hubs;
 
-namespace O2NextGen.Common.Consumers
+namespace O2NextGen.SmallTalk.SignalrHub.Messaging.Consumers
 {
     
     public class SendMessageCompletedEventConsumer: IConsumer<SendMessageCompletedEvent>
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/OnlineStatusCompletedEvent.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/OnlineStatusCompletedEvent.cs
index 983b899c..f3b9ebb8 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/OnlineStatusCompletedEvent.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/OnlineStatusCompletedEvent.cs
@@ -1,4 +1,4 @@
-namespace O2NextGen.Common
+namespace O2NextGen.SmallTalk.SignalrHub.Messaging
 {
     public class OnlineStatusCompletedEvent
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/SendMessageCompletedEvent.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/SendMessageCompletedEvent.cs
index 53ba6a31..bf4fbc31 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/SendMessageCompletedEvent.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Messaging/SendMessageCompletedEvent.cs
@@ -1,4 +1,4 @@
-namespace O2NextGen.Common
+namespace O2NextGen.SmallTalk.SignalrHub.Messaging
 {
     public class SendMessageCompletedEvent
     {
diff --git a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Startup.cs b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Startup.cs
index e3d18704..e469a5c7 100644
--- a/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Startup.cs
+++ b/src/Services/smalltalk/O2NextGen.SmallTalk.SignalrHub/Startup.cs
@@ -12,7 +12,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using O2NextGen.SmallTalk.SignalrHub.Helpers;
 using O2NextGen.SmallTalk.SignalrHub.Hubs;
-using RabbitMQ.Client;
+
 namespace O2NextGen.SmallTalk.SignalrHub
 {
     public class Startup
diff --git a/src/Services/smart-subscriber/O2NextGen.SmartSubscriber.Api/O2NextGen.SmartSubscriber.Api.csproj b/src/Services/smart-subscriber/O2NextGen.SmartSubscriber.Api/O2NextGen.SmartSubscriber.Api.csproj
index 0c05084e..a2dbc2be 100644
--- a/src/Services/smart-subscriber/O2NextGen.SmartSubscriber.Api/O2NextGen.SmartSubscriber.Api.csproj
+++ b/src/Services/smart-subscriber/O2NextGen.SmartSubscriber.Api/O2NextGen.SmartSubscriber.Api.csproj
@@ -9,8 +9,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
+	  <PackageReference Include="Microsoft.AspNetCore.App" />
+	  <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0">
+	  </PackageReference>
+	  <PackageReference Include="Serilog.AspNetCore" Version="2.1.1">
+	  </PackageReference>
+	  <PackageReference Include="Serilog.Settings.Configuration" Version="2.2.0">
+	  </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/docker-compose.override.yml b/src/docker-compose.override.yml
index 482f5a7f..17fa8f1d 100644
--- a/src/docker-compose.override.yml
+++ b/src/docker-compose.override.yml
@@ -115,6 +115,21 @@ services:
     #  - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
     #  - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro
 
+  o2nextgen.mediabasket.api:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ConnectionString=Server=sql.data;Initial Catalog=O2NextGen.MediaBasketDb;Persist Security Info=False;User ID=sa;Password=your@Password;Connection Timeout=30;
+      #- ASPNETCORE_URLS=https://+:443;http://+:80
+      - CloudinarySettings__CloudName=cloudName
+      - CloudinarySettings__ApiKey=api_key
+      - CloudinarySettings__ApiSecret=api_secret
+    ports:
+      - "5005:80"
+    depends_on:
+      - sql.data
+    networks:
+      - backend
+
   smalltalk.app: 
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index 254c6a4f..c09050ca 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -39,6 +39,12 @@ services:
       context: .
       dockerfile: Services/e-sender/O2NextGen.ESender.Api/Dockerfile
 
+  o2nextgen.mediabasket.api:
+    image: ${DOCKER_REGISTRY-}o2ng-media-basket-api
+    build:
+      context: .
+      dockerfile: Services/media-basket/O2NextGen.MediaBasket.Api/Dockerfile
+
   smalltalk.app: 
     image: ${DOCKER_REGISTRY-}smalltalk-app
     build: