Folder restructuring

Geeksltd · Nov 16, 2018 · 051f3bf · 051f3bf
1 parent da428fd
commit 051f3bf
Show file tree

Hide file tree

Showing 314 changed files with 298 additions and 1,287 deletions.
diff --git a/...xtentions/ControlValidationTranslation.cs → ...xtentions/ControlValidationTranslation.cs b/...xtentions/ControlValidationTranslation.cs → ...xtentions/ControlValidationTranslation.cs
diff --git a/...tions/Extensions.HtmlHelpers_Partially.cs → ...tions/Extensions.HtmlHelpers_Partially.cs b/...tions/Extensions.HtmlHelpers_Partially.cs → ...tions/Extensions.HtmlHelpers_Partially.cs
diff --git a/...alCandidates/Mvc.RemovalCandidates.csproj → ...alCandidates/Mvc.RemovalCandidates.csproj b/...alCandidates/Mvc.RemovalCandidates.csproj → ...alCandidates/Mvc.RemovalCandidates.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\@Assemblies\</OutputPath>
-    <DocumentationFile>..\@Assemblies\netstandard2.0\Mvc.RemovalCandidates.xml</DocumentationFile>
+    <OutputPath>..\bin\</OutputPath>
+    <DocumentationFile>..\bin\netstandard2.0\Mvc.RemovalCandidates.xml</DocumentationFile>
   </PropertyGroup>
 
 </Project>
diff --git a/.gitignore b/.gitignore
@@ -265,7 +265,7 @@ GCop.json
 GCopLog.txt
 /GCopReport.json
 /GCopReport.json
-@Assemblies
+bin
 /Olive.MvcJs
 nuget.exe
 /Utils/MSharp.Build/Properties/launchSettings.json
diff --git a/BuildAll.bat b/BuildAll.bat
@@ -9,7 +9,7 @@ if ERRORLEVEL 1 (goto error)
 dotnet build Olive.Audit
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.Encryption
+dotnet build Olive.Encryption
 if ERRORLEVEL 1 (goto error)
 
 dotnet build Olive.Entities.Data
@@ -27,73 +27,73 @@ if ERRORLEVEL 1 (goto error)
 dotnet build Olive.Entities.Data.SqlServer
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Entities\Olive.Entities.Cache.Redis
+dotnet build Olive.Entities.Cache.Redis
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.Aws
+dotnet build Olive.Aws
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.Blob.Aws
+dotnet build Olive.Blob.Aws
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.Compression
+dotnet build Olive.Compression
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.Csv
+dotnet build Olive.Csv
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.Drawing
+dotnet build Olive.Drawing
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.Excel
+dotnet build Olive.Excel
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.GeoLocation
+dotnet build Olive.GeoLocation
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.PDF
+dotnet build Olive.PDF
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.PushNotification
+dotnet build Olive.PushNotification
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Services\Olive.SMS
+dotnet build Olive.SMS
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Integration\Olive.ApiClient
+dotnet build Olive.ApiClient
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Integration\Olive.Microservices
+dotnet build Olive.Microservices
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Mvc\Olive.Web
+dotnet build Olive.Web
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Mvc\Olive.Security
+dotnet build Olive.Security
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Mvc\Olive.Mvc
+dotnet build Olive.Mvc
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Mvc\Olive.Mvc.Testing
+dotnet build Olive.Mvc.Testing
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Mvc\Olive.Email
+dotnet build Olive.Email
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Mvc\Olive.Security.Impersonation
+dotnet build Olive.Security.Impersonation
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Mvc\Olive.Mvc.IpFilter
+dotnet build Olive.Mvc.IpFilter
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Mvc\Olive.Mvc.Security.Auth0
+dotnet build Olive.Mvc.Security.Auth0
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Integration\Olive.ApiProxyGenerator
+dotnet build Olive.ApiProxyGenerator
 if ERRORLEVEL 1 (goto error)
 
-dotnet build Mvc\Olive.Hangfire
+dotnet build Olive.Hangfire
 if ERRORLEVEL 1 (goto error)
 
 exit /b 0

diff --git a/...gration/Olive.ApiClient/ApiClient.Auth.cs → Olive.ApiClient/ApiClient.Auth.cs b/...gration/Olive.ApiClient/ApiClient.Auth.cs → Olive.ApiClient/ApiClient.Auth.cs
diff --git a/...ation/Olive.ApiClient/ApiClient.Delete.cs → Olive.ApiClient/ApiClient.Delete.cs b/...ation/Olive.ApiClient/ApiClient.Delete.cs → Olive.ApiClient/ApiClient.Delete.cs
diff --git a/Integration/Olive.ApiClient/ApiClient.Get.cs → Olive.ApiClient/ApiClient.Get.cs b/Integration/Olive.ApiClient/ApiClient.Get.cs → Olive.ApiClient/ApiClient.Get.cs
diff --git a/...ration/Olive.ApiClient/ApiClient.Patch.cs → Olive.ApiClient/ApiClient.Patch.cs b/...ration/Olive.ApiClient/ApiClient.Patch.cs → Olive.ApiClient/ApiClient.Patch.cs
diff --git a/...gration/Olive.ApiClient/ApiClient.Post.cs → Olive.ApiClient/ApiClient.Post.cs b/...gration/Olive.ApiClient/ApiClient.Post.cs → Olive.ApiClient/ApiClient.Post.cs
diff --git a/Integration/Olive.ApiClient/ApiClient.Put.cs → Olive.ApiClient/ApiClient.Put.cs b/Integration/Olive.ApiClient/ApiClient.Put.cs → Olive.ApiClient/ApiClient.Put.cs
diff --git a/.../Olive.ApiClient/ApiClient.RequestInfo.cs → Olive.ApiClient/ApiClient.RequestInfo.cs b/.../Olive.ApiClient/ApiClient.RequestInfo.cs → Olive.ApiClient/ApiClient.RequestInfo.cs
diff --git a/...tion/Olive.ApiClient/ApiClient.Retries.cs → Olive.ApiClient/ApiClient.Retries.cs b/...tion/Olive.ApiClient/ApiClient.Retries.cs → Olive.ApiClient/ApiClient.Retries.cs
diff --git a/Integration/Olive.ApiClient/ApiClient.cs → Olive.ApiClient/ApiClient.cs b/Integration/Olive.ApiClient/ApiClient.cs → Olive.ApiClient/ApiClient.cs
diff --git a/...ation/Olive.ApiClient/ApiResponseCache.cs → Olive.ApiClient/ApiResponseCache.cs b/...ation/Olive.ApiClient/ApiResponseCache.cs → Olive.ApiClient/ApiResponseCache.cs
diff --git a/...ApiClient/Enums/ApiFallBackEventPolicy.cs → ...ApiClient/Enums/ApiFallBackEventPolicy.cs b/...ApiClient/Enums/ApiFallBackEventPolicy.cs → ...ApiClient/Enums/ApiFallBackEventPolicy.cs
diff --git a/...tion/Olive.ApiClient/Enums/CachePolicy.cs → Olive.ApiClient/Enums/CachePolicy.cs b/...tion/Olive.ApiClient/Enums/CachePolicy.cs → Olive.ApiClient/Enums/CachePolicy.cs
diff --git a/...n/Olive.ApiClient/Enums/OnApiCallError.cs → Olive.ApiClient/Enums/OnApiCallError.cs b/...n/Olive.ApiClient/Enums/OnApiCallError.cs → Olive.ApiClient/Enums/OnApiCallError.cs
diff --git a/Integration/Olive.ApiClient/FallBackEvent.cs → Olive.ApiClient/FallBackEvent.cs b/Integration/Olive.ApiClient/FallBackEvent.cs → Olive.ApiClient/FallBackEvent.cs
diff --git a/...ion/Olive.ApiClient/GetPolicy/GetCache.cs → Olive.ApiClient/GetPolicy/GetCache.cs b/...ion/Olive.ApiClient/GetPolicy/GetCache.cs → Olive.ApiClient/GetPolicy/GetCache.cs
diff --git a/...tion/Olive.ApiClient/GetPolicy/GetFail.cs → Olive.ApiClient/GetPolicy/GetFail.cs b/...tion/Olive.ApiClient/GetPolicy/GetFail.cs → Olive.ApiClient/GetPolicy/GetFail.cs
diff --git a/...ion/Olive.ApiClient/GetPolicy/GetFresh.cs → Olive.ApiClient/GetPolicy/GetFresh.cs b/...ion/Olive.ApiClient/GetPolicy/GetFresh.cs → Olive.ApiClient/GetPolicy/GetFresh.cs
diff --git a/....ApiClient/GetPolicy/GetImplementation.cs → ....ApiClient/GetPolicy/GetImplementation.cs b/....ApiClient/GetPolicy/GetImplementation.cs → ....ApiClient/GetPolicy/GetImplementation.cs
diff --git a/...tion/Olive.ApiClient/GetPolicy/GetNull.cs → Olive.ApiClient/GetPolicy/GetNull.cs b/...tion/Olive.ApiClient/GetPolicy/GetNull.cs → Olive.ApiClient/GetPolicy/GetNull.cs
diff --git a/...on/Olive.ApiClient/Olive.ApiClient.csproj → Olive.ApiClient/Olive.ApiClient.csproj b/...on/Olive.ApiClient/Olive.ApiClient.csproj → Olive.ApiClient/Olive.ApiClient.csproj
@@ -12,8 +12,8 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\..\@Assemblies\</OutputPath>
-    <DocumentationFile>..\..\@Assemblies\netstandard2.0\Olive.ApiClient.xml</DocumentationFile>
+    <OutputPath>..\bin\</OutputPath>
+    <DocumentationFile>..\bin\netstandard2.0\Olive.ApiClient.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -26,7 +26,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

diff --git a/.../Olive.ApiClient/StronglyTypedApiProxy.cs → Olive.ApiClient/StronglyTypedApiProxy.cs b/.../Olive.ApiClient/StronglyTypedApiProxy.cs → Olive.ApiClient/StronglyTypedApiProxy.cs
diff --git a/...piClient/Utilities/ApiClientExtensions.cs → ...piClient/Utilities/ApiClientExtensions.cs b/...piClient/Utilities/ApiClientExtensions.cs → ...piClient/Utilities/ApiClientExtensions.cs
diff --git a/...live.ApiProxyGenerator/CSharpFormatter.cs → Olive.ApiProxyGenerator/CSharpFormatter.cs b/...live.ApiProxyGenerator/CSharpFormatter.cs → Olive.ApiProxyGenerator/CSharpFormatter.cs
diff --git a/...ration/Olive.ApiProxyGenerator/Context.cs → Olive.ApiProxyGenerator/Context.cs b/...ration/Olive.ApiProxyGenerator/Context.cs → Olive.ApiProxyGenerator/Context.cs
diff --git a/...enerator/DtoDataProviderClassGenerator.cs → ...enerator/DtoDataProviderClassGenerator.cs b/...enerator/DtoDataProviderClassGenerator.cs → ...enerator/DtoDataProviderClassGenerator.cs
diff --git a/.../Olive.ApiProxyGenerator/DtoProgrammer.cs → Olive.ApiProxyGenerator/DtoProgrammer.cs b/.../Olive.ApiProxyGenerator/DtoProgrammer.cs → Olive.ApiProxyGenerator/DtoProgrammer.cs
diff --git a/...ation/Olive.ApiProxyGenerator/DtoTypes.cs → Olive.ApiProxyGenerator/DtoTypes.cs b/...ation/Olive.ApiProxyGenerator/DtoTypes.cs → Olive.ApiProxyGenerator/DtoTypes.cs
diff --git a/...ion/Olive.ApiProxyGenerator/Extensions.cs → Olive.ApiProxyGenerator/Extensions.cs b/...ion/Olive.ApiProxyGenerator/Extensions.cs → Olive.ApiProxyGenerator/Extensions.cs
diff --git a/...gration/Olive.ApiProxyGenerator/Helper.cs → Olive.ApiProxyGenerator/Helper.cs b/...gration/Olive.ApiProxyGenerator/Helper.cs → Olive.ApiProxyGenerator/Helper.cs
diff --git a/...piProxyGenerator/MSharpModelProgrammer.cs → ...piProxyGenerator/MSharpModelProgrammer.cs b/...piProxyGenerator/MSharpModelProgrammer.cs → ...piProxyGenerator/MSharpModelProgrammer.cs
diff --git a/...live.ApiProxyGenerator/MethodGenerator.cs → Olive.ApiProxyGenerator/MethodGenerator.cs b/...live.ApiProxyGenerator/MethodGenerator.cs → Olive.ApiProxyGenerator/MethodGenerator.cs
diff --git a/...erator/MockConfigurationClassGenerator.cs → ...erator/MockConfigurationClassGenerator.cs b/...erator/MockConfigurationClassGenerator.cs → ...erator/MockConfigurationClassGenerator.cs
diff --git a/...yGenerator/Olive.ApiProxyGenerator.csproj → ...yGenerator/Olive.ApiProxyGenerator.csproj b/...yGenerator/Olive.ApiProxyGenerator.csproj → ...yGenerator/Olive.ApiProxyGenerator.csproj
@@ -30,7 +30,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

diff --git a/...ive.ApiProxyGenerator/ParametersParser.cs → Olive.ApiProxyGenerator/ParametersParser.cs b/...ive.ApiProxyGenerator/ParametersParser.cs → Olive.ApiProxyGenerator/ParametersParser.cs
diff --git a/...ration/Olive.ApiProxyGenerator/Program.cs → Olive.ApiProxyGenerator/Program.cs b/...ration/Olive.ApiProxyGenerator/Program.cs → Olive.ApiProxyGenerator/Program.cs
diff --git a/...nerator/Project/MSharp46ProjectCreator.cs → ...nerator/Project/MSharp46ProjectCreator.cs b/...nerator/Project/MSharp46ProjectCreator.cs → ...nerator/Project/MSharp46ProjectCreator.cs
diff --git a/...Generator/Project/MSharpProjectCreator.cs → ...Generator/Project/MSharpProjectCreator.cs b/...Generator/Project/MSharpProjectCreator.cs → ...Generator/Project/MSharpProjectCreator.cs
diff --git a/...ApiProxyGenerator/Project/NugetCreator.cs → ...ApiProxyGenerator/Project/NugetCreator.cs b/...ApiProxyGenerator/Project/NugetCreator.cs → ...ApiProxyGenerator/Project/NugetCreator.cs
diff --git a/...iProxyGenerator/Project/ProjectCreator.cs → ...iProxyGenerator/Project/ProjectCreator.cs b/...iProxyGenerator/Project/ProjectCreator.cs → ...iProxyGenerator/Project/ProjectCreator.cs
diff --git a/...yGenerator/Project/ProxyProjectCreator.cs → ...yGenerator/Project/ProxyProjectCreator.cs b/...yGenerator/Project/ProxyProjectCreator.cs → ...yGenerator/Project/ProxyProjectCreator.cs
diff --git a/...yGenerator/Project/ReadmeFileGenerator.cs → ...yGenerator/Project/ReadmeFileGenerator.cs b/...yGenerator/Project/ReadmeFileGenerator.cs → ...yGenerator/Project/ReadmeFileGenerator.cs
diff --git a/...ties/PublishProfiles/FolderProfile.pubxml → ...ties/PublishProfiles/FolderProfile.pubxml b/...ties/PublishProfiles/FolderProfile.pubxml → ...ties/PublishProfiles/FolderProfile.pubxml
diff --git a/...ies/PublishProfiles/FolderProfile1.pubxml → ...ies/PublishProfiles/FolderProfile1.pubxml b/...ies/PublishProfiles/FolderProfile1.pubxml → ...ies/PublishProfiles/FolderProfile1.pubxml
diff --git a/...yGenerator/Properties/launchSettings.json → ...yGenerator/Properties/launchSettings.json b/...yGenerator/Properties/launchSettings.json → ...yGenerator/Properties/launchSettings.json
diff --git a/...ApiProxyGenerator/ProxyClassProgrammer.cs → ...ApiProxyGenerator/ProxyClassProgrammer.cs b/...ApiProxyGenerator/ProxyClassProgrammer.cs → ...ApiProxyGenerator/ProxyClassProgrammer.cs
diff --git a/...ion/Olive.ApiProxyGenerator/ProxyIcon.png → Olive.ApiProxyGenerator/ProxyIcon.png b/...ion/Olive.ApiProxyGenerator/ProxyIcon.png → Olive.ApiProxyGenerator/ProxyIcon.png
diff --git a/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj b/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\@Assemblies</OutputPath>
-    <DocumentationFile>..\@Assemblies\netstandard2.0\Olive.Audit.DatabaseLogger.xml</DocumentationFile>
+    <OutputPath>..\bin</OutputPath>
+    <DocumentationFile>..\bin\netstandard2.0\Olive.Audit.DatabaseLogger.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591;NU1701</NoWarn>
   </PropertyGroup>
 
@@ -27,13 +27,13 @@
 
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Audit">
-      <HintPath>..\@Assemblies\netstandard2.0\Olive.Audit.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.Audit.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Entities">
-      <HintPath>..\@Assemblies\netstandard2.0\Olive.Entities.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.Entities.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/Olive.Audit/Olive.Audit.csproj b/Olive.Audit/Olive.Audit.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\@Assemblies</OutputPath>
-    <DocumentationFile>..\@Assemblies\netstandard2.0\Olive.Audit.xml</DocumentationFile>
+    <OutputPath>..\bin</OutputPath>
+    <DocumentationFile>..\bin\netstandard2.0\Olive.Audit.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591;NU1701</NoWarn>
   </PropertyGroup>
 
@@ -27,10 +27,10 @@
 
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Entities">
-      <HintPath>..\@Assemblies\netstandard2.0\Olive.Entities.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.Entities.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/Olive.Aws.Ses/Olive.Aws.Ses.csproj b/Olive.Aws.Ses/Olive.Aws.Ses.csproj
@@ -12,8 +12,8 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\@Assemblies</OutputPath>
-    <DocumentationFile>..\@Assemblies\netcoreapp2.1\Olive.Aws.Ses.xml</DocumentationFile>
+    <OutputPath>..\bin</OutputPath>
+    <DocumentationFile>..\bin\netcoreapp2.1\Olive.Aws.Ses.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -26,13 +26,13 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Aws">
-      <HintPath>..\@Assemblies\netstandard2.0\Olive.Aws.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.Aws.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Email">
-      <HintPath>..\@Assemblies\netcoreapp2.1\Olive.Email.dll</HintPath>
+      <HintPath>..\bin\netcoreapp2.1\Olive.Email.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

diff --git a/Services/Olive.Aws/AWSExtensions.cs → Olive.Aws/AWSExtensions.cs b/Services/Olive.Aws/AWSExtensions.cs → Olive.Aws/AWSExtensions.cs
diff --git a/Services/Olive.Aws/Olive.Aws.csproj → Olive.Aws/Olive.Aws.csproj b/Services/Olive.Aws/Olive.Aws.csproj → Olive.Aws/Olive.Aws.csproj
@@ -15,8 +15,8 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
-    <OutputPath>..\..\@Assemblies\</OutputPath>
-    <DocumentationFile>..\..\@Assemblies\netstandard2.0\Olive.Aws.xml</DocumentationFile>
+    <OutputPath>..\bin\</OutputPath>
+    <DocumentationFile>..\bin\netstandard2.0\Olive.Aws.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +32,7 @@
 
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/Services/Olive.Aws/RuntimeIdentity.cs → Olive.Aws/RuntimeIdentity.cs b/Services/Olive.Aws/RuntimeIdentity.cs → Olive.Aws/RuntimeIdentity.cs
diff --git a/Services/Olive.Aws/Secrets.cs → Olive.Aws/Secrets.cs b/Services/Olive.Aws/Secrets.cs → Olive.Aws/Secrets.cs
diff --git a/Services/Olive.Blob.Aws/AWSInfo.cs → Olive.Blob.Aws/AWSInfo.cs b/Services/Olive.Blob.Aws/AWSInfo.cs → Olive.Blob.Aws/AWSInfo.cs
diff --git a/Services/Olive.Blob.Aws/BlobAWSExtensions.cs → Olive.Blob.Aws/BlobAWSExtensions.cs b/Services/Olive.Blob.Aws/BlobAWSExtensions.cs → Olive.Blob.Aws/BlobAWSExtensions.cs
diff --git a/Services/Olive.Blob.Aws/Olive.BlobAws.csproj → Olive.Blob.Aws/Olive.BlobAws.csproj b/Services/Olive.Blob.Aws/Olive.BlobAws.csproj → Olive.Blob.Aws/Olive.BlobAws.csproj
@@ -15,8 +15,8 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
-    <OutputPath>..\..\@Assemblies\</OutputPath>
-    <DocumentationFile>..\..\@Assemblies\netstandard2.0\Olive.BlobAws.xml</DocumentationFile>
+    <OutputPath>..\bin\</OutputPath>
+    <DocumentationFile>..\bin\netstandard2.0\Olive.BlobAws.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,16 +28,16 @@
 
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Aws">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.Aws.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.Aws.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Entities">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.Entities.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.Entities.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Entities.Data">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.Entities.Data.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/...s/Olive.Blob.Aws/S3BlobStorageProvider.cs → Olive.Blob.Aws/S3BlobStorageProvider.cs b/...s/Olive.Blob.Aws/S3BlobStorageProvider.cs → Olive.Blob.Aws/S3BlobStorageProvider.cs
diff --git a/...es/Olive.Blob.Aws/S3DocumentUrlBuilder.cs → Olive.Blob.Aws/S3DocumentUrlBuilder.cs b/...es/Olive.Blob.Aws/S3DocumentUrlBuilder.cs → Olive.Blob.Aws/S3DocumentUrlBuilder.cs
diff --git a/Services/Olive.Blob.Aws/S3FileHelper.cs → Olive.Blob.Aws/S3FileHelper.cs b/Services/Olive.Blob.Aws/S3FileHelper.cs → Olive.Blob.Aws/S3FileHelper.cs
diff --git a/Services/Olive.Compression/Compressor.cs → Olive.Compression/Compressor.cs b/Services/Olive.Compression/Compressor.cs → Olive.Compression/Compressor.cs
diff --git a/...live.Compression/Olive.Compression.csproj → Olive.Compression/Olive.Compression.csproj b/...live.Compression/Olive.Compression.csproj → Olive.Compression/Olive.Compression.csproj
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\..\@Assemblies\</OutputPath>
-    <DocumentationFile>..\..\@Assemblies\netstandard2.0\Olive.Compression.xml</DocumentationFile>
+    <OutputPath>..\bin\</OutputPath>
+    <DocumentationFile>..\bin\netstandard2.0\Olive.Compression.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
   </PropertyGroup>
 
@@ -29,7 +29,7 @@
 
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/Services/Olive.Compression/SevenZip.cs → Olive.Compression/SevenZip.cs b/Services/Olive.Compression/SevenZip.cs → Olive.Compression/SevenZip.cs
diff --git a/Services/Olive.Csv/CsvReader.cs → Olive.Csv/CsvReader.cs b/Services/Olive.Csv/CsvReader.cs → Olive.Csv/CsvReader.cs
diff --git a/Services/Olive.CSV/CsvWriter.cs → Olive.Csv/CsvWriter.cs b/Services/Olive.CSV/CsvWriter.cs → Olive.Csv/CsvWriter.cs
diff --git a/Services/Olive.Csv/Olive.Csv.csproj → Olive.Csv/Olive.Csv.csproj b/Services/Olive.Csv/Olive.Csv.csproj → Olive.Csv/Olive.Csv.csproj
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\..\@Assemblies\</OutputPath>
-    <DocumentationFile>..\..\@Assemblies\netstandard2.0\Olive.Csv.xml</DocumentationFile>
+    <OutputPath>..\bin\</OutputPath>
+    <DocumentationFile>..\bin\netstandard2.0\Olive.Csv.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
   </PropertyGroup>
 
@@ -29,10 +29,10 @@
 
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Entities">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.Entities.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.Entities.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/Services/Olive.Drawing/BitmapHelper.cs → Olive.Drawing/BitmapHelper.cs b/Services/Olive.Drawing/BitmapHelper.cs → Olive.Drawing/BitmapHelper.cs
diff --git a/Services/Olive.Drawing/Extensions.cs → Olive.Drawing/Extensions.cs b/Services/Olive.Drawing/Extensions.cs → Olive.Drawing/Extensions.cs
diff --git a/...ices/Olive.Drawing/GifPalleteGenerator.cs → Olive.Drawing/GifPalleteGenerator.cs b/...ices/Olive.Drawing/GifPalleteGenerator.cs → Olive.Drawing/GifPalleteGenerator.cs
diff --git a/Services/Olive.Drawing/GifProcessor.cs → Olive.Drawing/GifProcessor.cs b/Services/Olive.Drawing/GifProcessor.cs → Olive.Drawing/GifProcessor.cs
diff --git a/Services/Olive.Drawing/GraphicExtensions.cs → Olive.Drawing/GraphicExtensions.cs b/Services/Olive.Drawing/GraphicExtensions.cs → Olive.Drawing/GraphicExtensions.cs
diff --git a/Services/Olive.Drawing/ImageOptimizer.cs → Olive.Drawing/ImageOptimizer.cs b/Services/Olive.Drawing/ImageOptimizer.cs → Olive.Drawing/ImageOptimizer.cs
diff --git a/Services/Olive.Drawing/Olive.Drawing.csproj → Olive.Drawing/Olive.Drawing.csproj b/Services/Olive.Drawing/Olive.Drawing.csproj → Olive.Drawing/Olive.Drawing.csproj
@@ -17,8 +17,8 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputPath>..\..\@Assemblies\</OutputPath>
-    <DocumentationFile>..\..\@Assemblies\netstandard2.0\Olive.Drawing.xml</DocumentationFile>
+    <OutputPath>..\bin\</OutputPath>
+    <DocumentationFile>..\bin\netstandard2.0\Olive.Drawing.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
   </PropertyGroup>
 
@@ -30,10 +30,10 @@
 
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Entities">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.Entities.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.Entities.dll</HintPath>
     </Reference>
   </ItemGroup>
 

diff --git a/...mail.Sending/EmailAttachmentSerializer.cs → ...mail.Sending/EmailAttachmentSerializer.cs b/...mail.Sending/EmailAttachmentSerializer.cs → ...mail.Sending/EmailAttachmentSerializer.cs
diff --git a/...ve.Email/Email.Sending/EmailDispatcher.cs → Olive.Email/Email.Sending/EmailDispatcher.cs b/...ve.Email/Email.Sending/EmailDispatcher.cs → Olive.Email/Email.Sending/EmailDispatcher.cs
diff --git a/...ve.Email/Email.Sending/EmailExtensions.cs → Olive.Email/Email.Sending/EmailExtensions.cs b/...ve.Email/Email.Sending/EmailExtensions.cs → Olive.Email/Email.Sending/EmailExtensions.cs
diff --git a/Mvc/Olive.Email/Email.Sending/EmailOutbox.cs → Olive.Email/Email.Sending/EmailOutbox.cs b/Mvc/Olive.Email/Email.Sending/EmailOutbox.cs → Olive.Email/Email.Sending/EmailOutbox.cs
diff --git a/...il/Email.Sending/EmailSendingEventArgs.cs → ...il/Email.Sending/EmailSendingEventArgs.cs b/...il/Email.Sending/EmailSendingEventArgs.cs → ...il/Email.Sending/EmailSendingEventArgs.cs
diff --git a/...live.Email/Email.Sending/IEmailMessage.cs → Olive.Email/Email.Sending/IEmailMessage.cs b/...live.Email/Email.Sending/IEmailMessage.cs → Olive.Email/Email.Sending/IEmailMessage.cs
diff --git a/...Olive.Email/Email.Sending/IEmailOutbox.cs → Olive.Email/Email.Sending/IEmailOutbox.cs b/...Olive.Email/Email.Sending/IEmailOutbox.cs → Olive.Email/Email.Sending/IEmailOutbox.cs
diff --git a/...Email/Email.Sending/MailMessageCreator.cs → ...Email/Email.Sending/MailMessageCreator.cs b/...Email/Email.Sending/MailMessageCreator.cs → ...Email/Email.Sending/MailMessageCreator.cs
diff --git a/Mvc/Olive.Email/EmailConfiguration.cs → Olive.Email/EmailConfiguration.cs b/Mvc/Olive.Email/EmailConfiguration.cs → Olive.Email/EmailConfiguration.cs
diff --git a/....Email/Mvc.Testing/EmailTestDevCommand.cs → ....Email/Mvc.Testing/EmailTestDevCommand.cs b/....Email/Mvc.Testing/EmailTestDevCommand.cs → ....Email/Mvc.Testing/EmailTestDevCommand.cs
diff --git a/Mvc/Olive.Email/Olive.Email.csproj → Olive.Email/Olive.Email.csproj b/Mvc/Olive.Email/Olive.Email.csproj → Olive.Email/Olive.Email.csproj
@@ -14,8 +14,8 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\..\@Assemblies\</OutputPath>
-    <DocumentationFile>..\..\@Assemblies\netcoreapp2.1\Olive.Email.xml</DocumentationFile>
+    <OutputPath>..\bin\</OutputPath>
+    <DocumentationFile>..\bin\netcoreapp2.1\Olive.Email.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -28,13 +28,13 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Olive">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Entities">
-      <HintPath>..\..\@Assemblies\netstandard2.0\Olive.Entities.dll</HintPath>
+      <HintPath>..\bin\netstandard2.0\Olive.Entities.dll</HintPath>
     </Reference>
     <Reference Include="Olive.Web">
-      <HintPath>..\..\@Assemblies\netcoreapp2.1\Olive.Web.dll</HintPath>
+      <HintPath>..\bin\netcoreapp2.1\Olive.Web.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

diff --git a/Mvc/Olive.Email/Template/EmailExtensions.cs → Olive.Email/Template/EmailExtensions.cs b/Mvc/Olive.Email/Template/EmailExtensions.cs → Olive.Email/Template/EmailExtensions.cs
diff --git a/Mvc/Olive.Email/Template/IEmailTemplate.cs → Olive.Email/Template/IEmailTemplate.cs b/Mvc/Olive.Email/Template/IEmailTemplate.cs → Olive.Email/Template/IEmailTemplate.cs
diff --git a/...ces/Olive.Encryption/AsymmetricKeyPair.cs → Olive.Encryption/AsymmetricKeyPair.cs b/...ces/Olive.Encryption/AsymmetricKeyPair.cs → Olive.Encryption/AsymmetricKeyPair.cs
diff --git a/...Olive.Encryption/Encryption.Asymmetric.cs → Olive.Encryption/Encryption.Asymmetric.cs b/...Olive.Encryption/Encryption.Asymmetric.cs → Olive.Encryption/Encryption.Asymmetric.cs
diff --git a/.../Olive.Encryption/Encryption.Symmetric.cs → Olive.Encryption/Encryption.Symmetric.cs b/.../Olive.Encryption/Encryption.Symmetric.cs → Olive.Encryption/Encryption.Symmetric.cs