diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd35f60..55b6aa1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,13 +20,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Build and Test Flight
+      - name: Build and Test Flight Microservice
         uses: ./.github/actions/build-test
         if: success()
         id: build-test-flight-step
         with:
-          project-path: 'src/Services/Flight/src/Flight.Api'
-          tests-path: 'src/Services/Flight/tests/'
+          project-path: '3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api'
+          tests-path: '3-Microservices-Architecture-Style/src/Services/Flight/tests/'
           # wildcard search for files with the ".cobertura.xml" extension in all subdirectories of the current directory
           # https://www.jamescroft.co.uk/combining-multiple-code-coverage-results-in-azure-devops/
           # https://stackoverflow.com/questions/53255065/dotnet-unit-test-with-coverlet-how-to-get-coverage-for-entire-solution-and-not
@@ -35,13 +35,13 @@ jobs:
           service-name: 'Flight'
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and Test Identity
+      - name: Build and Test Identity Microservice
         uses: ./.github/actions/build-test
         if: success()
         id: build-test-identity-step
         with:
-          project-path: 'src/Services/Identity/src/Identity.Api'
-          tests-path: 'src/Services/Identity/tests/'
+          project-path: '3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api'
+          tests-path: '3-Microservices-Architecture-Style/src/Services/Identity/tests/'
           # wildcard search for files with the ".cobertura.xml" extension in all subdirectories of the current directory
           # https://www.jamescroft.co.uk/combining-multiple-code-coverage-results-in-azure-devops/
           # https://stackoverflow.com/questions/53255065/dotnet-unit-test-with-coverlet-how-to-get-coverage-for-entire-solution-and-not
@@ -50,13 +50,13 @@ jobs:
           service-name: 'Identity'
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and Test Passenger
+      - name: Build and Test Passenger Microservice
         uses: ./.github/actions/build-test
         if: success()
         id: build-test-passenger-step
         with:
-          project-path: 'src/Services/Passenger/src/Passenger.Api'
-          tests-path: 'src/Services/Passenger/tests/'
+          project-path: '3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api'
+          tests-path: '3-Microservices-Architecture-Style/src/Services/Passenger/tests/'
           # wildcard search for files with the ".cobertura.xml" extension in all subdirectories of the current directory
           # https://www.jamescroft.co.uk/combining-multiple-code-coverage-results-in-azure-devops/
           # https://stackoverflow.com/questions/53255065/dotnet-unit-test-with-coverlet-how-to-get-coverage-for-entire-solution-and-not
@@ -65,13 +65,13 @@ jobs:
           service-name: 'Passenger'
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and Test Booking
+      - name: Build and Test Booking Microservice
         uses: ./.github/actions/build-test
         if: success()
         id: build-test-booking-step
         with:
-          project-path: 'src/Services/Booking/src/Booking.Api'
-          tests-path: 'src/Services/Booking/tests/'
+          project-path: '3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api'
+          tests-path: '3-Microservices-Architecture-Style/src/Services/Booking/tests/'
           # wildcard search for files with the ".cobertura.xml" extension in all subdirectories of the current directory
           # https://www.jamescroft.co.uk/combining-multiple-code-coverage-results-in-azure-devops/
           # https://stackoverflow.com/questions/53255065/dotnet-unit-test-with-coverlet-how-to-get-coverage-for-entire-solution-and-not
@@ -91,42 +91,42 @@ jobs:
         run:
           echo "Release version is:" ${{ steps.last_release.outputs.tag_name }}
 
-      - name: Build and Publish Identity to Docker
+      - name: Build and Publish Identity Microservice to Docker
         if: ${{ github.ref == 'refs/heads/main' && success() }}
         uses: ./.github/actions/docker-build-publish
         with:
           tag-name: ${{ steps.last_release.outputs.tag_name }}
           registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
           registry-password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          dockerfile-path: 'src/Services/Identity/Dockerfile'
+          dockerfile-path: '3-Microservices-Architecture-Style/src/Services/Identity/Dockerfile'
           image-name: 'booking-microservices-identity'
 
-      - name: Build and Publish Flight to Docker
+      - name: Build and Publish Flight Microservice to Docker
         if: ${{ github.ref == 'refs/heads/main' && success() }}
         uses: ./.github/actions/docker-build-publish
         with:
           tag-name: ${{ steps.last_release.outputs.tag_name }}
           registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
           registry-password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          dockerfile-path: 'src/Services/Flight/Dockerfile'
+          dockerfile-path: '3-Microservices-Architecture-Style/src/Services/Flight/Dockerfile'
           image-name: 'booking-microservices-flight'
 
-      - name: Build and Publish Passenger to Docker
+      - name: Build and Publish Passenger Microservice to Docker
         if: ${{ github.ref == 'refs/heads/main' && success() }}
         uses: ./.github/actions/docker-build-publish
         with:
           tag-name: ${{ steps.last_release.outputs.tag_name }}
           registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
           registry-password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          dockerfile-path: 'src/Services/Passenger/Dockerfile'
+          dockerfile-path: '3-Microservices-Architecture-Style/src/Services/Passenger/Dockerfile'
           image-name: 'booking-microservices-passenger'
 
-      - name: Build and Publish Booking to Docker
+      - name: Build and Publish Booking Microservice to Docker
         if: ${{ github.ref == 'refs/heads/main' && success() }}
         uses: ./.github/actions/docker-build-publish
         with:
           tag-name: ${{ steps.last_release.outputs.tag_name }}
           registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
           registry-password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          dockerfile-path: 'src/Services/Booking/Dockerfile'
+          dockerfile-path: '3-Microservices-Architecture-Style/src/Services/Booking/Dockerfile'
           image-name: 'booking-microservices-booking'
diff --git a/1-Monolith-Architecture-Style/.gitkeep b/1-Monolith-Architecture-Style/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/2-Modular-Monolith-Architecture-Style/.gitkeep b/2-Modular-Monolith-Architecture-Style/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/3-Microservices-Architecture-Style/src/ApiGateway/Dockerfile b/3-Microservices-Architecture-Style/src/ApiGateway/Dockerfile
new file mode 100644
index 0000000..d281818
--- /dev/null
+++ b/3-Microservices-Architecture-Style/src/ApiGateway/Dockerfile
@@ -0,0 +1,45 @@
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
+WORKDIR /
+
+COPY ./.editorconfig ./
+COPY ./global.json ./
+COPY ./Directory.Build.props ./
+
+# Setup working directory for the project
+COPY ./BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/ApiGateway/src/ApiGateway.csproj ./3-Microservices-Architecture-Style/src/ApiGateway/src/
+
+
+# Restore nuget packages
+RUN dotnet restore ./3-Microservices-Architecture-Style/src/ApiGateway/src/ApiGateway.csproj
+
+# Copy project files
+COPY ./BuildingBlocks ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/ApiGateway/src  ./3-Microservices-Architecture-Style/src/ApiGateway/src/
+
+# Build project with Release configuration
+# and no restore, as we did it already
+
+RUN ls
+RUN dotnet build  -c Release --no-restore ./3-Microservices-Architecture-Style/src/ApiGateway/src/ApiGateway.csproj
+
+WORKDIR /3-Microservices-Architecture-Style/src/ApiGateway/src
+
+# Publish project to output folder
+# and no build, as we did it already
+RUN dotnet publish -c Release --no-build -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
+
+# Setup working directory for the project
+WORKDIR /
+COPY --from=builder /3-Microservices-Architecture-Style/src/ApiGateway/src/out  .
+
+ENV ASPNETCORE_URLS https://*:443, http://*:80
+ENV ASPNETCORE_ENVIRONMENT docker
+
+EXPOSE 80
+EXPOSE 443
+
+ENTRYPOINT ["dotnet", "ApiGateway.dll"]
+
diff --git a/src/ApiGateway/dev.Dockerfile b/3-Microservices-Architecture-Style/src/ApiGateway/dev.Dockerfile
similarity index 55%
rename from src/ApiGateway/dev.Dockerfile
rename to 3-Microservices-Architecture-Style/src/ApiGateway/dev.Dockerfile
index 42d5f08..8f93d37 100644
--- a/src/ApiGateway/dev.Dockerfile
+++ b/3-Microservices-Architecture-Style/src/ApiGateway/dev.Dockerfile
@@ -6,26 +6,26 @@ COPY ./global.json ./
 COPY ./Directory.Build.props ./
 
 # Setup working directory for the project
-COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
-COPY ./src/ApiGateway/src/ApiGateway.csproj ./ApiGateway/src/
+COPY ./BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/ApiGateway/src/ApiGateway.csproj ./3-Microservices-Architecture-Style/src/ApiGateway/src/
 
 
 # Restore nuget packages
 RUN --mount=type=cache,id=gateway_nuget,target=/root/.nuget/packages \
-    dotnet restore ./ApiGateway/src/ApiGateway.csproj
+    dotnet restore ./3-Microservices-Architecture-Style/src/ApiGateway/src/ApiGateway.csproj
 
 # Copy project files
-COPY ./src/BuildingBlocks ./BuildingBlocks/
-COPY ./src/ApiGateway/src  ./ApiGateway/src/
+COPY ./BuildingBlocks ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/ApiGateway/src  ./3-Microservices-Architecture-Style/src/ApiGateway/src/
 
 # Build project with Release configuration
 # and no restore, as we did it already
 
 RUN ls
 RUN --mount=type=cache,id=gateway_nuget,target=/root/.nuget/packages \
-    dotnet build  -c Release --no-restore ./ApiGateway/src/ApiGateway.csproj
+    dotnet build  -c Release --no-restore ./3-Microservices-Architecture-Style/src/ApiGateway/src/ApiGateway.csproj
 
-WORKDIR /ApiGateway/src
+WORKDIR /3-Microservices-Architecture-Style/src/ApiGateway/src
 
 # Publish project to output folder
 # and no build, as we did it already
@@ -36,7 +36,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:9.0
 
 # Setup working directory for the project
 WORKDIR /
-COPY --from=builder /src/ApiGateway/src/out  .
+COPY --from=builder /3-Microservices-Architecture-Style/src/ApiGateway/src/out  .
 
 ENV ASPNETCORE_URLS https://*:443, http://*:80
 ENV ASPNETCORE_ENVIRONMENT docker
diff --git a/3-Microservices-Architecture-Style/src/ApiGateway/src/ApiGateway.csproj b/3-Microservices-Architecture-Style/src/ApiGateway/src/ApiGateway.csproj
new file mode 100644
index 0000000..93fff20
--- /dev/null
+++ b/3-Microservices-Architecture-Style/src/ApiGateway/src/ApiGateway.csproj
@@ -0,0 +1,5 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/ApiGateway/src/Program.cs b/3-Microservices-Architecture-Style/src/ApiGateway/src/Program.cs
similarity index 100%
rename from src/ApiGateway/src/Program.cs
rename to 3-Microservices-Architecture-Style/src/ApiGateway/src/Program.cs
diff --git a/src/ApiGateway/src/Properties/launchSettings.json b/3-Microservices-Architecture-Style/src/ApiGateway/src/Properties/launchSettings.json
similarity index 100%
rename from src/ApiGateway/src/Properties/launchSettings.json
rename to 3-Microservices-Architecture-Style/src/ApiGateway/src/Properties/launchSettings.json
diff --git a/src/ApiGateway/src/appsettings.Development.json b/3-Microservices-Architecture-Style/src/ApiGateway/src/appsettings.Development.json
similarity index 100%
rename from src/ApiGateway/src/appsettings.Development.json
rename to 3-Microservices-Architecture-Style/src/ApiGateway/src/appsettings.Development.json
diff --git a/src/ApiGateway/src/appsettings.docker.json b/3-Microservices-Architecture-Style/src/ApiGateway/src/appsettings.docker.json
similarity index 100%
rename from src/ApiGateway/src/appsettings.docker.json
rename to 3-Microservices-Architecture-Style/src/ApiGateway/src/appsettings.docker.json
diff --git a/src/ApiGateway/src/appsettings.json b/3-Microservices-Architecture-Style/src/ApiGateway/src/appsettings.json
similarity index 100%
rename from src/ApiGateway/src/appsettings.json
rename to 3-Microservices-Architecture-Style/src/ApiGateway/src/appsettings.json
diff --git a/3-Microservices-Architecture-Style/src/Services/Booking/Dockerfile b/3-Microservices-Architecture-Style/src/Services/Booking/Dockerfile
new file mode 100644
index 0000000..567bb42
--- /dev/null
+++ b/3-Microservices-Architecture-Style/src/Services/Booking/Dockerfile
@@ -0,0 +1,47 @@
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
+WORKDIR /
+
+COPY ./.editorconfig ./
+COPY ./global.json ./
+COPY ./Directory.Build.props ./
+
+# Setup working directory for the project
+COPY ./BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking.csproj ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/
+COPY ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Booking.Api.csproj ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/
+
+
+# Restore nuget packages
+RUN  dotnet restore ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Booking.Api.csproj
+
+# Copy project files
+COPY ./BuildingBlocks ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/  ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/
+COPY ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/  ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/
+
+# Build project with Release configuration
+# and no restore, as we did it already
+
+RUN ls
+RUN  dotnet build  -c Release --no-restore ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Booking.Api.csproj
+
+WORKDIR /3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api
+
+# Publish project to output folder
+# and no build, as we did it already
+RUN dotnet publish -c Release --no-build -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
+
+# Setup working directory for the project
+WORKDIR /
+COPY --from=builder /3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/out  .
+
+ENV ASPNETCORE_URLS https://*:443, http://*:80
+ENV ASPNETCORE_ENVIRONMENT docker
+
+EXPOSE 80
+EXPOSE 443
+
+ENTRYPOINT ["dotnet", "Booking.Api.dll"]
+
diff --git a/3-Microservices-Architecture-Style/src/Services/Booking/dev.Dockerfile b/3-Microservices-Architecture-Style/src/Services/Booking/dev.Dockerfile
new file mode 100644
index 0000000..4bb566b
--- /dev/null
+++ b/3-Microservices-Architecture-Style/src/Services/Booking/dev.Dockerfile
@@ -0,0 +1,50 @@
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
+WORKDIR /
+
+COPY ./.editorconfig ./
+COPY ./global.json ./
+COPY ./Directory.Build.props ./
+
+# Setup working directory for the project
+COPY ./BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking.csproj ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/
+COPY ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Booking.Api.csproj ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/
+
+
+# Restore nuget packages
+RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages \
+    dotnet restore ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Booking.Api.csproj
+
+# Copy project files
+COPY ./BuildingBlocks ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/  ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/
+COPY ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/  ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/
+
+# Build project with Release configuration
+# and no restore, as we did it already
+
+RUN ls
+RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages\
+    dotnet build  -c Release --no-restore ./3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Booking.Api.csproj
+
+WORKDIR /3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api
+
+# Publish project to output folder
+# and no build, as we did it already
+RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages\
+    dotnet publish -c Release --no-build -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
+
+# Setup working directory for the project
+WORKDIR /
+COPY --from=builder /3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/out  .
+
+ENV ASPNETCORE_URLS https://*:443, http://*:80
+ENV ASPNETCORE_ENVIRONMENT docker
+
+EXPOSE 80
+EXPOSE 443
+
+ENTRYPOINT ["dotnet", "Booking.Api.dll"]
+
diff --git a/src/Services/Booking/src/Booking.Api/Booking.Api.csproj b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Booking.Api.csproj
similarity index 98%
rename from src/Services/Booking/src/Booking.Api/Booking.Api.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Booking.Api.csproj
index 1929b17..ae9ddd7 100644
--- a/src/Services/Booking/src/Booking.Api/Booking.Api.csproj
+++ b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Booking.Api.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
   <ItemGroup>
     <ProjectReference Include="..\Booking\Booking.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/src/Services/Booking/src/Booking.Api/Program.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Program.cs
similarity index 100%
rename from src/Services/Booking/src/Booking.Api/Program.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Program.cs
diff --git a/src/Services/Booking/src/Booking.Api/Properties/launchSettings.json b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Properties/launchSettings.json
similarity index 100%
rename from src/Services/Booking/src/Booking.Api/Properties/launchSettings.json
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/Properties/launchSettings.json
diff --git a/src/Services/Booking/src/Booking.Api/appsettings.Development.json b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/appsettings.Development.json
similarity index 100%
rename from src/Services/Booking/src/Booking.Api/appsettings.Development.json
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/appsettings.Development.json
diff --git a/src/Services/Booking/src/Booking.Api/appsettings.docker.json b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/appsettings.docker.json
similarity index 100%
rename from src/Services/Booking/src/Booking.Api/appsettings.docker.json
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/appsettings.docker.json
diff --git a/src/Services/Booking/src/Booking.Api/appsettings.json b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/appsettings.json
similarity index 100%
rename from src/Services/Booking/src/Booking.Api/appsettings.json
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/appsettings.json
diff --git a/src/Services/Booking/src/Booking.Api/appsettings.test.json b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/appsettings.test.json
similarity index 100%
rename from src/Services/Booking/src/Booking.Api/appsettings.test.json
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking.Api/appsettings.test.json
diff --git a/src/Services/Booking/src/Booking/Booking.csproj b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking.csproj
similarity index 89%
rename from src/Services/Booking/src/Booking/Booking.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking.csproj
index 6f6d912..08a30e8 100644
--- a/src/Services/Booking/src/Booking/Booking.csproj
+++ b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Grpc.Tools" Version="2.68.1">
       <PrivateAssets>all</PrivateAssets>
@@ -23,4 +19,8 @@
     </AssemblyAttribute>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Services/Booking/src/Booking/Booking/Dtos/CreateReservation.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Dtos/CreateReservation.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Dtos/CreateReservation.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Dtos/CreateReservation.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/BookingAlreadyExistException.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/BookingAlreadyExistException.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Exceptions/BookingAlreadyExistException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/BookingAlreadyExistException.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/FlightNotFoundException.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/FlightNotFoundException.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Exceptions/FlightNotFoundException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/FlightNotFoundException.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidAircraftIdException.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidAircraftIdException.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Exceptions/InvalidAircraftIdException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidAircraftIdException.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidArriveAirportIdException.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidArriveAirportIdException.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Exceptions/InvalidArriveAirportIdException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidArriveAirportIdException.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidDepartureAirportIdException.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidDepartureAirportIdException.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Exceptions/InvalidDepartureAirportIdException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidDepartureAirportIdException.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightDateException.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightDateException.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightDateException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightDateException.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightNumberException.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightNumberException.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightNumberException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightNumberException.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPassengerNameException.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPassengerNameException.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPassengerNameException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPassengerNameException.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPriceException.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPriceException.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPriceException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPriceException.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/SeatNumberException.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/SeatNumberException.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Exceptions/SeatNumberException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Exceptions/SeatNumberException.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/V1/CreateBooking.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/V1/CreateBooking.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Features/CreatingBook/V1/CreateBooking.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/V1/CreateBooking.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Models/Booking.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Models/Booking.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Models/Booking.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Models/Booking.cs
diff --git a/src/Services/Booking/src/Booking/Booking/Models/BookingReadModel.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Models/BookingReadModel.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/Models/BookingReadModel.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/Models/BookingReadModel.cs
diff --git a/src/Services/Booking/src/Booking/Booking/ValueObjects/PassengerInfo.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/ValueObjects/PassengerInfo.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/ValueObjects/PassengerInfo.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/ValueObjects/PassengerInfo.cs
diff --git a/src/Services/Booking/src/Booking/Booking/ValueObjects/Trip.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/ValueObjects/Trip.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Booking/ValueObjects/Trip.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Booking/ValueObjects/Trip.cs
diff --git a/src/Services/Booking/src/Booking/BookingProjection.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/BookingProjection.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/BookingProjection.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/BookingProjection.cs
diff --git a/src/Services/Booking/src/Booking/BookingRoot.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/BookingRoot.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/BookingRoot.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/BookingRoot.cs
diff --git a/src/Services/Booking/src/Booking/Configuration/GrpcOptions.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Configuration/GrpcOptions.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Configuration/GrpcOptions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Configuration/GrpcOptions.cs
diff --git a/src/Services/Booking/src/Booking/Data/BookingReadDbContext.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Data/BookingReadDbContext.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Data/BookingReadDbContext.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Data/BookingReadDbContext.cs
diff --git a/src/Services/Booking/src/Booking/EventMapper.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/EventMapper.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/EventMapper.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/EventMapper.cs
diff --git a/src/Services/Booking/src/Booking/Extensions/Infrastructure/GrpcClientExtensions.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Extensions/Infrastructure/GrpcClientExtensions.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Extensions/Infrastructure/GrpcClientExtensions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Extensions/Infrastructure/GrpcClientExtensions.cs
diff --git a/src/Services/Booking/src/Booking/Extensions/Infrastructure/InfrastructureExtensions.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Extensions/Infrastructure/InfrastructureExtensions.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Extensions/Infrastructure/InfrastructureExtensions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Extensions/Infrastructure/InfrastructureExtensions.cs
diff --git a/src/Services/Booking/src/Booking/Extensions/Infrastructure/MediatRExtensions.cs b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Extensions/Infrastructure/MediatRExtensions.cs
similarity index 100%
rename from src/Services/Booking/src/Booking/Extensions/Infrastructure/MediatRExtensions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/Extensions/Infrastructure/MediatRExtensions.cs
diff --git a/src/Services/Booking/src/Booking/GrpcClient/Protos/flight.proto b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/GrpcClient/Protos/flight.proto
similarity index 100%
rename from src/Services/Booking/src/Booking/GrpcClient/Protos/flight.proto
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/GrpcClient/Protos/flight.proto
diff --git a/src/Services/Booking/src/Booking/GrpcClient/Protos/passenger.proto b/3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/GrpcClient/Protos/passenger.proto
similarity index 100%
rename from src/Services/Booking/src/Booking/GrpcClient/Protos/passenger.proto
rename to 3-Microservices-Architecture-Style/src/Services/Booking/src/Booking/GrpcClient/Protos/passenger.proto
diff --git a/src/Services/Booking/tests/IntegrationTest/Booking/Features/CreateBookingTests.cs b/3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Booking/Features/CreateBookingTests.cs
similarity index 100%
rename from src/Services/Booking/tests/IntegrationTest/Booking/Features/CreateBookingTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Booking/Features/CreateBookingTests.cs
diff --git a/src/Services/Booking/tests/IntegrationTest/BookingIntegrationTestBase.cs b/3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/BookingIntegrationTestBase.cs
similarity index 100%
rename from src/Services/Booking/tests/IntegrationTest/BookingIntegrationTestBase.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/BookingIntegrationTestBase.cs
diff --git a/src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs b/3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs
similarity index 100%
rename from src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs
diff --git a/src/Services/Booking/tests/IntegrationTest/Fakes/FakeFlightResponse.cs b/3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Fakes/FakeFlightResponse.cs
similarity index 100%
rename from src/Services/Booking/tests/IntegrationTest/Fakes/FakeFlightResponse.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Fakes/FakeFlightResponse.cs
diff --git a/src/Services/Booking/tests/IntegrationTest/Fakes/FakeGetAvailableSeatsResponse.cs b/3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Fakes/FakeGetAvailableSeatsResponse.cs
similarity index 100%
rename from src/Services/Booking/tests/IntegrationTest/Fakes/FakeGetAvailableSeatsResponse.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Fakes/FakeGetAvailableSeatsResponse.cs
diff --git a/src/Services/Booking/tests/IntegrationTest/Fakes/FakePassengerResponse.cs b/3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Fakes/FakePassengerResponse.cs
similarity index 100%
rename from src/Services/Booking/tests/IntegrationTest/Fakes/FakePassengerResponse.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Fakes/FakePassengerResponse.cs
diff --git a/src/Services/Booking/tests/IntegrationTest/Fakes/FakeReserveSeatResponse.cs b/3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Fakes/FakeReserveSeatResponse.cs
similarity index 100%
rename from src/Services/Booking/tests/IntegrationTest/Fakes/FakeReserveSeatResponse.cs
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Fakes/FakeReserveSeatResponse.cs
diff --git a/src/Services/Booking/tests/IntegrationTest/Integration.Test.csproj b/3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Integration.Test.csproj
similarity index 100%
rename from src/Services/Booking/tests/IntegrationTest/Integration.Test.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/Integration.Test.csproj
diff --git a/src/Services/Booking/tests/IntegrationTest/xunit.runner.json b/3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/xunit.runner.json
similarity index 100%
rename from src/Services/Booking/tests/IntegrationTest/xunit.runner.json
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/IntegrationTest/xunit.runner.json
diff --git a/src/Services/Booking/tests/PerformanceTest/.openapi-generator-ignore b/3-Microservices-Architecture-Style/src/Services/Booking/tests/PerformanceTest/.openapi-generator-ignore
similarity index 100%
rename from src/Services/Booking/tests/PerformanceTest/.openapi-generator-ignore
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/PerformanceTest/.openapi-generator-ignore
diff --git a/src/Services/Booking/tests/PerformanceTest/.openapi-generator/FILES b/3-Microservices-Architecture-Style/src/Services/Booking/tests/PerformanceTest/.openapi-generator/FILES
similarity index 100%
rename from src/Services/Booking/tests/PerformanceTest/.openapi-generator/FILES
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/PerformanceTest/.openapi-generator/FILES
diff --git a/src/Services/Booking/tests/PerformanceTest/.openapi-generator/VERSION b/3-Microservices-Architecture-Style/src/Services/Booking/tests/PerformanceTest/.openapi-generator/VERSION
similarity index 100%
rename from src/Services/Booking/tests/PerformanceTest/.openapi-generator/VERSION
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/PerformanceTest/.openapi-generator/VERSION
diff --git a/src/Services/Booking/tests/PerformanceTest/README.md b/3-Microservices-Architecture-Style/src/Services/Booking/tests/PerformanceTest/README.md
similarity index 100%
rename from src/Services/Booking/tests/PerformanceTest/README.md
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/PerformanceTest/README.md
diff --git a/src/Services/Booking/tests/PerformanceTest/script.js b/3-Microservices-Architecture-Style/src/Services/Booking/tests/PerformanceTest/script.js
similarity index 100%
rename from src/Services/Booking/tests/PerformanceTest/script.js
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/PerformanceTest/script.js
diff --git a/src/Services/Booking/tests/tests.sln b/3-Microservices-Architecture-Style/src/Services/Booking/tests/tests.sln
similarity index 100%
rename from src/Services/Booking/tests/tests.sln
rename to 3-Microservices-Architecture-Style/src/Services/Booking/tests/tests.sln
diff --git a/3-Microservices-Architecture-Style/src/Services/Flight/Dockerfile b/3-Microservices-Architecture-Style/src/Services/Flight/Dockerfile
new file mode 100644
index 0000000..950b6a8
--- /dev/null
+++ b/3-Microservices-Architecture-Style/src/Services/Flight/Dockerfile
@@ -0,0 +1,48 @@
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
+WORKDIR /
+
+COPY ./.editorconfig ./
+COPY ./global.json ./
+COPY ./Directory.Build.props ./
+
+# Setup working directory for the project
+COPY ./BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flight.csproj ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/
+COPY ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Flight.Api.csproj ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/
+
+
+# Restore nuget packages
+RUN dotnet restore ./Services/Flight/src/Flight.Api/Flight.Api.csproj
+
+# Copy project files
+COPY ./BuildingBlocks ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/  ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/
+COPY ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/  ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/
+
+# Build project with Release configuration
+# and no restore, as we did it already
+
+RUN ls
+RUN dotnet build  -c Release --no-restore ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Flight.Api.csproj
+
+WORKDIR /3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api
+
+# Publish project to output folder
+# and no build, as we did it already
+RUN dotnet publish -c Release --no-build -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
+
+# Setup working directory for the project
+WORKDIR /
+COPY --from=builder /3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/out  .
+
+
+ENV ASPNETCORE_URLS https://*:443, http://*:80
+ENV ASPNETCORE_ENVIRONMENT docker
+
+EXPOSE 80
+EXPOSE 443
+
+ENTRYPOINT ["dotnet", "Flight.Api.dll"]
+
diff --git a/3-Microservices-Architecture-Style/src/Services/Flight/dev.Dockerfile b/3-Microservices-Architecture-Style/src/Services/Flight/dev.Dockerfile
new file mode 100644
index 0000000..48ea0de
--- /dev/null
+++ b/3-Microservices-Architecture-Style/src/Services/Flight/dev.Dockerfile
@@ -0,0 +1,51 @@
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
+WORKDIR /
+
+COPY ./.editorconfig ./
+COPY ./global.json ./
+COPY ./Directory.Build.props ./
+
+# Setup working directory for the project
+COPY ./BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flight.csproj ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/
+COPY ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Flight.Api.csproj ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/
+
+
+# Restore nuget packages
+RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
+    dotnet restore ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Flight.Api.csproj
+
+# Copy project files
+COPY ./BuildingBlocks ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/  ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/
+COPY .3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/  ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/
+
+# Build project with Release configuration
+# and no restore, as we did it already
+
+RUN ls
+RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
+    dotnet build  -c Release --no-restore ./3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Flight.Api.csproj
+
+WORKDIR /3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api
+
+# Publish project to output folder
+# and no build, as we did it already
+RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
+    dotnet publish -c Release --no-build -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
+
+# Setup working directory for the project
+WORKDIR /
+COPY --from=builder /3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/out  .
+
+
+ENV ASPNETCORE_URLS https://*:443, http://*:80
+ENV ASPNETCORE_ENVIRONMENT docker
+
+EXPOSE 80
+EXPOSE 443
+
+ENTRYPOINT ["dotnet", "Flight.Api.dll"]
+
diff --git a/src/Services/Flight/src/Flight.Api/Flight.Api.csproj b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Flight.Api.csproj
similarity index 100%
rename from src/Services/Flight/src/Flight.Api/Flight.Api.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Flight.Api.csproj
diff --git a/src/Services/Flight/src/Flight.Api/Program.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Program.cs
similarity index 100%
rename from src/Services/Flight/src/Flight.Api/Program.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Program.cs
diff --git a/src/Services/Flight/src/Flight.Api/Properties/launchSettings.json b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Properties/launchSettings.json
similarity index 100%
rename from src/Services/Flight/src/Flight.Api/Properties/launchSettings.json
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/Properties/launchSettings.json
diff --git a/src/Services/Flight/src/Flight.Api/appsettings.Development.json b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/appsettings.Development.json
similarity index 100%
rename from src/Services/Flight/src/Flight.Api/appsettings.Development.json
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/appsettings.Development.json
diff --git a/src/Services/Flight/src/Flight.Api/appsettings.docker.json b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/appsettings.docker.json
similarity index 100%
rename from src/Services/Flight/src/Flight.Api/appsettings.docker.json
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/appsettings.docker.json
diff --git a/src/Services/Flight/src/Flight.Api/appsettings.json b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/appsettings.json
similarity index 100%
rename from src/Services/Flight/src/Flight.Api/appsettings.json
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/appsettings.json
diff --git a/src/Services/Flight/src/Flight.Api/appsettings.test.json b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/appsettings.test.json
similarity index 100%
rename from src/Services/Flight/src/Flight.Api/appsettings.test.json
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight.Api/appsettings.test.json
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Dtos/AircraftDto.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Dtos/AircraftDto.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Dtos/AircraftDto.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Dtos/AircraftDto.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Exceptions/AircraftAlreadyExistException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Exceptions/AircraftAlreadyExistException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Exceptions/AircraftAlreadyExistException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Exceptions/AircraftAlreadyExistException.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidAircraftIdException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidAircraftIdException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidAircraftIdException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidAircraftIdException.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidManufacturingYearException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidManufacturingYearException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidManufacturingYearException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidManufacturingYearException.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidModelException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidModelException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidModelException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidModelException.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidNameException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidNameException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidNameException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidNameException.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraftMongo.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraftMongo.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraftMongo.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraftMongo.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/Models/AircraftReadModel.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Models/AircraftReadModel.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/Models/AircraftReadModel.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/Models/AircraftReadModel.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/ManufacturingYear.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/ManufacturingYear.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/ValueObjects/ManufacturingYear.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/ManufacturingYear.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Model.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Model.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Model.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Model.cs
diff --git a/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Name.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Name.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Name.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/Name.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Dtos/AirportDto.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Dtos/AirportDto.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Dtos/AirportDto.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Dtos/AirportDto.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Exceptions/AirportAlreadyExistException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Exceptions/AirportAlreadyExistException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Exceptions/AirportAlreadyExistException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Exceptions/AirportAlreadyExistException.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAddressException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAddressException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAddressException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAddressException.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAirportIdException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAirportIdException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAirportIdException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAirportIdException.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidCodeException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidCodeException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Exceptions/InvalidCodeException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidCodeException.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidNameException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidNameException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Exceptions/InvalidNameException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidNameException.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Features/AirportMappings.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Features/AirportMappings.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Features/AirportMappings.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Features/AirportMappings.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirportMongo.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirportMongo.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirportMongo.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirportMongo.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Models/Airport.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Models/Airport.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Models/Airport.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Models/Airport.cs
diff --git a/src/Services/Flight/src/Flight/Airports/Models/AirportReadModel.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Models/AirportReadModel.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/Models/AirportReadModel.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/Models/AirportReadModel.cs
diff --git a/src/Services/Flight/src/Flight/Airports/ValueObjects/Address.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/ValueObjects/Address.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/ValueObjects/Address.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/ValueObjects/Address.cs
diff --git a/src/Services/Flight/src/Flight/Airports/ValueObjects/AirportId.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/ValueObjects/AirportId.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/ValueObjects/AirportId.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/ValueObjects/AirportId.cs
diff --git a/src/Services/Flight/src/Flight/Airports/ValueObjects/Code.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/ValueObjects/Code.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/ValueObjects/Code.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/ValueObjects/Code.cs
diff --git a/src/Services/Flight/src/Flight/Airports/ValueObjects/Name.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/ValueObjects/Name.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Airports/ValueObjects/Name.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Airports/ValueObjects/Name.cs
diff --git a/src/Services/Flight/src/Flight/Data/Configurations/AircraftConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Configurations/AircraftConfiguration.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/Configurations/AircraftConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Configurations/AircraftConfiguration.cs
diff --git a/src/Services/Flight/src/Flight/Data/Configurations/AirportConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Configurations/AirportConfiguration.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/Configurations/AirportConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Configurations/AirportConfiguration.cs
diff --git a/src/Services/Flight/src/Flight/Data/Configurations/FlightConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Configurations/FlightConfiguration.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/Configurations/FlightConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Configurations/FlightConfiguration.cs
diff --git a/src/Services/Flight/src/Flight/Data/Configurations/SeatConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Configurations/SeatConfiguration.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/Configurations/SeatConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Configurations/SeatConfiguration.cs
diff --git a/src/Services/Flight/src/Flight/Data/DesignTimeDbContextFactory.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/DesignTimeDbContextFactory.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/DesignTimeDbContextFactory.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/DesignTimeDbContextFactory.cs
diff --git a/src/Services/Flight/src/Flight/Data/FlightDbContext.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/FlightDbContext.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/FlightDbContext.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/FlightDbContext.cs
diff --git a/src/Services/Flight/src/Flight/Data/FlightReadDbContext.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/FlightReadDbContext.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/FlightReadDbContext.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/FlightReadDbContext.cs
diff --git a/src/Services/Flight/src/Flight/Data/Migrations/20230611230948_initial.Designer.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Migrations/20230611230948_initial.Designer.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/Migrations/20230611230948_initial.Designer.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Migrations/20230611230948_initial.Designer.cs
diff --git a/src/Services/Flight/src/Flight/Data/Migrations/20230611230948_initial.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Migrations/20230611230948_initial.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/Migrations/20230611230948_initial.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Migrations/20230611230948_initial.cs
diff --git a/src/Services/Flight/src/Flight/Data/Migrations/FlightDbContextModelSnapshot.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Migrations/FlightDbContextModelSnapshot.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/Migrations/FlightDbContextModelSnapshot.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Migrations/FlightDbContextModelSnapshot.cs
diff --git a/src/Services/Flight/src/Flight/Data/Seed/FlightDataSeeder.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Seed/FlightDataSeeder.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/Seed/FlightDataSeeder.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Seed/FlightDataSeeder.cs
diff --git a/src/Services/Flight/src/Flight/Data/Seed/InitialData.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Seed/InitialData.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/Seed/InitialData.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/Seed/InitialData.cs
diff --git a/src/Services/Flight/src/Flight/Data/readme.md b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/readme.md
similarity index 100%
rename from src/Services/Flight/src/Flight/Data/readme.md
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Data/readme.md
diff --git a/src/Services/Flight/src/Flight/EventMapper.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/EventMapper.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/EventMapper.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/EventMapper.cs
diff --git a/src/Services/Flight/src/Flight/Extensions/Infrastructure/InfrastructureExtensions.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Extensions/Infrastructure/InfrastructureExtensions.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Extensions/Infrastructure/InfrastructureExtensions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Extensions/Infrastructure/InfrastructureExtensions.cs
diff --git a/src/Services/Flight/src/Flight/Extensions/Infrastructure/MediatRExtensions.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Extensions/Infrastructure/MediatRExtensions.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Extensions/Infrastructure/MediatRExtensions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Extensions/Infrastructure/MediatRExtensions.cs
diff --git a/src/Services/Flight/src/Flight/Flight.csproj b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flight.csproj
similarity index 94%
rename from src/Services/Flight/src/Flight/Flight.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flight.csproj
index 77a2826..11e6fca 100644
--- a/src/Services/Flight/src/Flight/Flight.csproj
+++ b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flight.csproj
@@ -21,10 +21,6 @@
     <Protobuf Include="GrpcServer\Protos\flight.proto" GrpcServices="Both" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>Unit.Test</_Parameter1>
@@ -40,5 +36,8 @@
       <_Parameter1>EndToEnd.Test</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Services/Flight/src/Flight/FlightRoot.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/FlightRoot.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/FlightRoot.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/FlightRoot.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Dtos/FlightDto.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Dtos/FlightDto.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Dtos/FlightDto.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Dtos/FlightDto.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Enums/FlightStatus.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Enums/FlightStatus.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Enums/FlightStatus.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Enums/FlightStatus.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/FlightAlreadyExistException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/FlightAlreadyExistException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Exceptions/FlightAlreadyExistException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/FlightAlreadyExistException.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/FlightExceptions.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/FlightExceptions.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Exceptions/FlightExceptions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/FlightExceptions.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/FlightNotFountException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/FlightNotFountException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Exceptions/FlightNotFountException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/FlightNotFountException.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidArriveDateException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidArriveDateException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidArriveDateException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidArriveDateException.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDepartureDateException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDepartureDateException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDepartureDateException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDepartureDateException.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDurationException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDurationException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDurationException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDurationException.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightDateException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightDateException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightDateException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightDateException.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightIdException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightIdException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightIdException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightIdException.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightNumberException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightNumberException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightNumberException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightNumberException.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidPriceException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidPriceException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidPriceException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidPriceException.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlightMongo.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlightMongo.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlightMongo.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlightMongo.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlightMongo.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlightMongo.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlightMongo.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlightMongo.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Features/FlightMappings.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/FlightMappings.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Features/FlightMappings.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/FlightMappings.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlight.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlightMongo.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlightMongo.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlightMongo.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlightMongo.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Models/Flight.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Models/Flight.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Models/Flight.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Models/Flight.cs
diff --git a/src/Services/Flight/src/Flight/Flights/Models/FlightReadModel.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Models/FlightReadModel.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/Models/FlightReadModel.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/Models/FlightReadModel.cs
diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/ArriveDate.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/ArriveDate.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/ValueObjects/ArriveDate.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/ArriveDate.cs
diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/DepartureDate.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/DepartureDate.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/ValueObjects/DepartureDate.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/DepartureDate.cs
diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/DurationMinutes.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/DurationMinutes.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/ValueObjects/DurationMinutes.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/DurationMinutes.cs
diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightDate.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightDate.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/ValueObjects/FlightDate.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightDate.cs
diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightId.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightId.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/ValueObjects/FlightId.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightId.cs
diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightNumber.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightNumber.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/ValueObjects/FlightNumber.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightNumber.cs
diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/Price.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/Price.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Flights/ValueObjects/Price.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Flights/ValueObjects/Price.cs
diff --git a/src/Services/Flight/src/Flight/GrpcServer/Protos/flight.proto b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/GrpcServer/Protos/flight.proto
similarity index 100%
rename from src/Services/Flight/src/Flight/GrpcServer/Protos/flight.proto
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/GrpcServer/Protos/flight.proto
diff --git a/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Dtos/SeatDto.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Dtos/SeatDto.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Dtos/SeatDto.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Dtos/SeatDto.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Enums/SeatClass.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Enums/SeatClass.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Enums/SeatClass.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Enums/SeatClass.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Enums/SeatType.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Enums/SeatType.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Enums/SeatType.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Enums/SeatType.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Exceptions/AllSeatsFullException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Exceptions/AllSeatsFullException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Exceptions/AllSeatsFullException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Exceptions/AllSeatsFullException.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatIdException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatIdException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatIdException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatIdException.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatNumberException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatNumberException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatNumberException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatNumberException.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyExistException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyExistException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyExistException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyExistException.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Exceptions/SeatNumberIncorrectException.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Exceptions/SeatNumberIncorrectException.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Exceptions/SeatNumberIncorrectException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Exceptions/SeatNumberIncorrectException.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeatMongo.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeatMongo.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeatMongo.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeatMongo.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeat.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeat.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeat.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeat.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeatMongo.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeatMongo.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeatMongo.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/V1/ReserveSeatMongo.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Models/Seat.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Models/Seat.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Models/Seat.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Models/Seat.cs
diff --git a/src/Services/Flight/src/Flight/Seats/Models/SeatReadModel.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Models/SeatReadModel.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/Models/SeatReadModel.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/Models/SeatReadModel.cs
diff --git a/src/Services/Flight/src/Flight/Seats/ValueObjects/SeatId.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/ValueObjects/SeatId.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/ValueObjects/SeatId.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/ValueObjects/SeatId.cs
diff --git a/src/Services/Flight/src/Flight/Seats/ValueObjects/SeatNumber.cs b/3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/ValueObjects/SeatNumber.cs
similarity index 100%
rename from src/Services/Flight/src/Flight/Seats/ValueObjects/SeatNumber.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/src/Flight/Seats/ValueObjects/SeatNumber.cs
diff --git a/src/Services/Flight/tests/EndToEndTest/EndToEnd.Test.csproj b/3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/EndToEnd.Test.csproj
similarity index 100%
rename from src/Services/Flight/tests/EndToEndTest/EndToEnd.Test.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/EndToEnd.Test.csproj
diff --git a/src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightCommand.cs
diff --git a/src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightMongoCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightMongoCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightMongoCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightMongoCommand.cs
diff --git a/src/Services/Flight/tests/EndToEndTest/Flight/Features/CreateFlightTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/Flight/Features/CreateFlightTests.cs
similarity index 100%
rename from src/Services/Flight/tests/EndToEndTest/Flight/Features/CreateFlightTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/Flight/Features/CreateFlightTests.cs
diff --git a/src/Services/Flight/tests/EndToEndTest/Flight/Features/GetFlightByIdTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/Flight/Features/GetFlightByIdTests.cs
similarity index 100%
rename from src/Services/Flight/tests/EndToEndTest/Flight/Features/GetFlightByIdTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/Flight/Features/GetFlightByIdTests.cs
diff --git a/src/Services/Flight/tests/EndToEndTest/FlightEndToEndTestBase.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/FlightEndToEndTestBase.cs
similarity index 100%
rename from src/Services/Flight/tests/EndToEndTest/FlightEndToEndTestBase.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/FlightEndToEndTestBase.cs
diff --git a/src/Services/Flight/tests/EndToEndTest/FlightTestDataSeeder.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/FlightTestDataSeeder.cs
similarity index 100%
rename from src/Services/Flight/tests/EndToEndTest/FlightTestDataSeeder.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/FlightTestDataSeeder.cs
diff --git a/src/Services/Flight/tests/EndToEndTest/Routes/ApiRoutes.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/Routes/ApiRoutes.cs
similarity index 100%
rename from src/Services/Flight/tests/EndToEndTest/Routes/ApiRoutes.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/Routes/ApiRoutes.cs
diff --git a/src/Services/Flight/tests/EndToEndTest/xunit.runner.json b/3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/xunit.runner.json
similarity index 100%
rename from src/Services/Flight/tests/EndToEndTest/xunit.runner.json
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/EndToEndTest/xunit.runner.json
diff --git a/src/Services/Flight/tests/IntegrationTest/Aircraft/Features/CreateAircraftTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Aircraft/Features/CreateAircraftTests.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Aircraft/Features/CreateAircraftTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Aircraft/Features/CreateAircraftTests.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Airport/Features/CreateAirportTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Airport/Features/CreateAirportTests.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Airport/Features/CreateAirportTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Airport/Features/CreateAirportTests.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAircraftCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAircraftCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAircraftCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAircraftCommand.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAirportCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAirportCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAirportCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAirportCommand.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightCommand.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightMongoCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightMongoCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightMongoCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightMongoCommand.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatCommand.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatMongoCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatMongoCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatMongoCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatMongoCommand.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeUpdateFlightCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeUpdateFlightCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Fakes/FakeUpdateFlightCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Fakes/FakeUpdateFlightCommand.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/DeleteFlightTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Flight/Features/DeleteFlightTests.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Flight/Features/DeleteFlightTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Flight/Features/DeleteFlightTests.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetAvailableFlightsTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetAvailableFlightsTests.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Flight/Features/GetAvailableFlightsTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetAvailableFlightsTests.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetFlightByIdTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetFlightByIdTests.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Flight/Features/GetFlightByIdTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetFlightByIdTests.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/UpdateFlightTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Flight/Features/UpdateFlightTests.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Flight/Features/UpdateFlightTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Flight/Features/UpdateFlightTests.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/FlightIntegrationTestBase.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/FlightIntegrationTestBase.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/FlightIntegrationTestBase.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/FlightIntegrationTestBase.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/FlightTestDataSeeder.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/FlightTestDataSeeder.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/FlightTestDataSeeder.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/FlightTestDataSeeder.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Integration.Test.csproj b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Integration.Test.csproj
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Integration.Test.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Integration.Test.csproj
diff --git a/src/Services/Flight/tests/IntegrationTest/Seat/Features/GetAvailableSeatsTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Seat/Features/GetAvailableSeatsTests.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Seat/Features/GetAvailableSeatsTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Seat/Features/GetAvailableSeatsTests.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/Seat/Features/ReserveSeatTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Seat/Features/ReserveSeatTests.cs
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/Seat/Features/ReserveSeatTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/Seat/Features/ReserveSeatTests.cs
diff --git a/src/Services/Flight/tests/IntegrationTest/xunit.runner.json b/3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/xunit.runner.json
similarity index 100%
rename from src/Services/Flight/tests/IntegrationTest/xunit.runner.json
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/IntegrationTest/xunit.runner.json
diff --git a/src/Services/Flight/tests/PerformanceTest/.openapi-generator-ignore b/3-Microservices-Architecture-Style/src/Services/Flight/tests/PerformanceTest/.openapi-generator-ignore
similarity index 100%
rename from src/Services/Flight/tests/PerformanceTest/.openapi-generator-ignore
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/PerformanceTest/.openapi-generator-ignore
diff --git a/src/Services/Flight/tests/PerformanceTest/.openapi-generator/FILES b/3-Microservices-Architecture-Style/src/Services/Flight/tests/PerformanceTest/.openapi-generator/FILES
similarity index 100%
rename from src/Services/Flight/tests/PerformanceTest/.openapi-generator/FILES
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/PerformanceTest/.openapi-generator/FILES
diff --git a/src/Services/Flight/tests/PerformanceTest/.openapi-generator/VERSION b/3-Microservices-Architecture-Style/src/Services/Flight/tests/PerformanceTest/.openapi-generator/VERSION
similarity index 100%
rename from src/Services/Flight/tests/PerformanceTest/.openapi-generator/VERSION
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/PerformanceTest/.openapi-generator/VERSION
diff --git a/src/Services/Flight/tests/PerformanceTest/README.md b/3-Microservices-Architecture-Style/src/Services/Flight/tests/PerformanceTest/README.md
similarity index 100%
rename from src/Services/Flight/tests/PerformanceTest/README.md
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/PerformanceTest/README.md
diff --git a/src/Services/Flight/tests/PerformanceTest/script.js b/3-Microservices-Architecture-Style/src/Services/Flight/tests/PerformanceTest/script.js
similarity index 100%
rename from src/Services/Flight/tests/PerformanceTest/script.js
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/PerformanceTest/script.js
diff --git a/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandHandlerTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandHandlerTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandHandlerTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandHandlerTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandValidatorTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandValidatorTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandValidatorTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandValidatorTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandHandlerTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandHandlerTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandHandlerTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandHandlerTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandValidatorTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandValidatorTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandValidatorTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandValidatorTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Common/DbContextFactory.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Common/DbContextFactory.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Common/DbContextFactory.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Common/DbContextFactory.cs
diff --git a/src/Services/Flight/tests/UnitTest/Common/MapperFactory.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Common/MapperFactory.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Common/MapperFactory.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Common/MapperFactory.cs
diff --git a/src/Services/Flight/tests/UnitTest/Common/UnitTestFixture.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Common/UnitTestFixture.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Common/UnitTestFixture.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Common/UnitTestFixture.cs
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAircraftCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAircraftCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAircraftCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAircraftCommand.cs
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAirportCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAirportCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAirportCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAirportCommand.cs
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateFlightCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateFlightCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Fakes/FakeCreateFlightCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateFlightCommand.cs
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateSeatCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateSeatCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Fakes/FakeCreateSeatCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateSeatCommand.cs
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeFlightCreate.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeFlightCreate.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Fakes/FakeFlightCreate.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeFlightCreate.cs
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeFlightUpdate.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeFlightUpdate.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Fakes/FakeFlightUpdate.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeFlightUpdate.cs
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAircraftCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAircraftCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAircraftCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAircraftCommand.cs
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAirportCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAirportCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAirportCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAirportCommand.cs
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateFlightCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateFlightCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateFlightCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateFlightCommand.cs
diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateSeatCommand.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateSeatCommand.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateSeatCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateSeatCommand.cs
diff --git a/src/Services/Flight/tests/UnitTest/Flight/Features/Domains/CreateFlightTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Flight/Features/Domains/CreateFlightTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Flight/Features/Domains/CreateFlightTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Flight/Features/Domains/CreateFlightTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Flight/Features/Domains/UpdateFlightTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Flight/Features/Domains/UpdateFlightTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Flight/Features/Domains/UpdateFlightTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Flight/Features/Domains/UpdateFlightTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Flight/Features/Handlers/CreateFlight/CreateFlightCommandHandlerTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Flight/Features/Handlers/CreateFlight/CreateFlightCommandHandlerTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Flight/Features/Handlers/CreateFlight/CreateFlightCommandHandlerTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Flight/Features/Handlers/CreateFlight/CreateFlightCommandHandlerTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Flight/Features/Handlers/CreateFlight/CreateFlightCommandValidatorTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Flight/Features/Handlers/CreateFlight/CreateFlightCommandValidatorTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Flight/Features/Handlers/CreateFlight/CreateFlightCommandValidatorTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Flight/Features/Handlers/CreateFlight/CreateFlightCommandValidatorTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Flight/FlightMappingTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Flight/FlightMappingTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Flight/FlightMappingTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Flight/FlightMappingTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandValidatorTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandValidatorTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandValidatorTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandValidatorTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Seat/SeatMappingTests.cs b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Seat/SeatMappingTests.cs
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Seat/SeatMappingTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Seat/SeatMappingTests.cs
diff --git a/src/Services/Flight/tests/UnitTest/Unit.Test.csproj b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Unit.Test.csproj
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/Unit.Test.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/Unit.Test.csproj
diff --git a/src/Services/Flight/tests/UnitTest/xunit.runner.json b/3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/xunit.runner.json
similarity index 100%
rename from src/Services/Flight/tests/UnitTest/xunit.runner.json
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/UnitTest/xunit.runner.json
diff --git a/src/Services/Flight/tests/tests.sln b/3-Microservices-Architecture-Style/src/Services/Flight/tests/tests.sln
similarity index 100%
rename from src/Services/Flight/tests/tests.sln
rename to 3-Microservices-Architecture-Style/src/Services/Flight/tests/tests.sln
diff --git a/3-Microservices-Architecture-Style/src/Services/Identity/Dockerfile b/3-Microservices-Architecture-Style/src/Services/Identity/Dockerfile
new file mode 100644
index 0000000..01123af
--- /dev/null
+++ b/3-Microservices-Architecture-Style/src/Services/Identity/Dockerfile
@@ -0,0 +1,47 @@
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
+
+# Setup working directory for the project
+WORKDIR /
+
+COPY ./.editorconfig ./
+COPY ./global.json ./
+COPY ./Directory.Build.props ./
+
+COPY ./BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity.csproj ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/
+COPY ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Identity.Api.csproj ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/
+
+# Restore nuget packages
+RUN dotnet restore ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Identity.Api.csproj
+
+# Copy project files
+COPY ./BuildingBlocks ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/  ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/
+COPY ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/  ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/
+
+# Build project with Release configuration
+# and no restore, as we did it already
+
+RUN ls
+RUN dotnet build  -c Release --no-restore ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Identity.Api.csproj
+
+WORKDIR /3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api
+
+# Publish project to output folder
+# and no build, as we did it already
+RUN dotnet publish -c Release --no-build -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
+
+# Setup working directory for the project
+WORKDIR /
+COPY --from=builder /3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/out  .
+
+ENV ASPNETCORE_URLS https://*:443, http://*:80
+ENV ASPNETCORE_ENVIRONMENT docker
+
+EXPOSE 80
+EXPOSE 443
+
+ENTRYPOINT ["dotnet", "Identity.Api.dll"]
+
diff --git a/3-Microservices-Architecture-Style/src/Services/Identity/dev.Dockerfile b/3-Microservices-Architecture-Style/src/Services/Identity/dev.Dockerfile
new file mode 100644
index 0000000..d47c074
--- /dev/null
+++ b/3-Microservices-Architecture-Style/src/Services/Identity/dev.Dockerfile
@@ -0,0 +1,50 @@
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
+
+# Setup working directory for the project
+WORKDIR /
+
+COPY ./.editorconfig ./
+COPY ./global.json ./
+COPY ./Directory.Build.props ./
+
+COPY ./BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity.csproj ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/
+COPY ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Identity.Api.csproj ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/
+
+# Restore nuget packages
+RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
+    dotnet restore .3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Identity.Api.csproj
+
+# Copy project files
+COPY ./BuildingBlocks ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/  ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/
+COPY ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/  ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/
+
+# Build project with Release configuration
+# and no restore, as we did it already
+
+RUN ls
+RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
+    dotnet build  -c Release --no-restore ./3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Identity.Api.csproj
+
+WORKDIR /3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api
+
+# Publish project to output folder
+# and no build, as we did it already
+RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
+   dotnet publish -c Release --no-build -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
+
+# Setup working directory for the project
+WORKDIR /
+COPY --from=builder /3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/out  .
+
+ENV ASPNETCORE_URLS https://*:443, http://*:80
+ENV ASPNETCORE_ENVIRONMENT docker
+
+EXPOSE 80
+EXPOSE 443
+
+ENTRYPOINT ["dotnet", "Identity.Api.dll"]
+
diff --git a/src/Services/Identity/src/Identity.Api/Identity.Api.csproj b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Identity.Api.csproj
similarity index 100%
rename from src/Services/Identity/src/Identity.Api/Identity.Api.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Identity.Api.csproj
diff --git a/src/Services/Identity/src/Identity.Api/Program.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Program.cs
similarity index 100%
rename from src/Services/Identity/src/Identity.Api/Program.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Program.cs
diff --git a/src/Services/Identity/src/Identity.Api/Properties/launchSettings.json b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Properties/launchSettings.json
similarity index 100%
rename from src/Services/Identity/src/Identity.Api/Properties/launchSettings.json
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/Properties/launchSettings.json
diff --git a/src/Services/Identity/src/Identity.Api/appsettings.Development.json b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/appsettings.Development.json
similarity index 100%
rename from src/Services/Identity/src/Identity.Api/appsettings.Development.json
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/appsettings.Development.json
diff --git a/src/Services/Identity/src/Identity.Api/appsettings.docker.json b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/appsettings.docker.json
similarity index 100%
rename from src/Services/Identity/src/Identity.Api/appsettings.docker.json
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/appsettings.docker.json
diff --git a/src/Services/Identity/src/Identity.Api/appsettings.json b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/appsettings.json
similarity index 100%
rename from src/Services/Identity/src/Identity.Api/appsettings.json
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/appsettings.json
diff --git a/src/Services/Identity/src/Identity.Api/appsettings.test.json b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/appsettings.test.json
similarity index 100%
rename from src/Services/Identity/src/Identity.Api/appsettings.test.json
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/appsettings.test.json
diff --git a/src/Services/Identity/src/Identity.Api/keys/is-signing-key-0AC3347A09AA5E44E947F3E30ED54871.json b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/keys/is-signing-key-0AC3347A09AA5E44E947F3E30ED54871.json
similarity index 100%
rename from src/Services/Identity/src/Identity.Api/keys/is-signing-key-0AC3347A09AA5E44E947F3E30ED54871.json
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/keys/is-signing-key-0AC3347A09AA5E44E947F3E30ED54871.json
diff --git a/src/Services/Identity/src/Identity.Api/keys/is-signing-key-A57781A0405849BDE786A79636460E49.json b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/keys/is-signing-key-A57781A0405849BDE786A79636460E49.json
similarity index 100%
rename from src/Services/Identity/src/Identity.Api/keys/is-signing-key-A57781A0405849BDE786A79636460E49.json
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity.Api/keys/is-signing-key-A57781A0405849BDE786A79636460E49.json
diff --git a/src/Services/Identity/src/Identity/Configurations/AuthOptions.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Configurations/AuthOptions.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Configurations/AuthOptions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Configurations/AuthOptions.cs
diff --git a/src/Services/Identity/src/Identity/Configurations/Config.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Configurations/Config.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Configurations/Config.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Configurations/Config.cs
diff --git a/src/Services/Identity/src/Identity/Configurations/EventMapper.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Configurations/EventMapper.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Configurations/EventMapper.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Configurations/EventMapper.cs
diff --git a/src/Services/Identity/src/Identity/Configurations/IdentityRoot.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Configurations/IdentityRoot.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Configurations/IdentityRoot.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Configurations/IdentityRoot.cs
diff --git a/src/Services/Identity/src/Identity/Configurations/UserValidator.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Configurations/UserValidator.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Configurations/UserValidator.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Configurations/UserValidator.cs
diff --git a/src/Services/Identity/src/Identity/Data/Configurations/RoleClaimConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/RoleClaimConfiguration.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Configurations/RoleClaimConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/RoleClaimConfiguration.cs
diff --git a/src/Services/Identity/src/Identity/Data/Configurations/RoleConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/RoleConfiguration.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Configurations/RoleConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/RoleConfiguration.cs
diff --git a/src/Services/Identity/src/Identity/Data/Configurations/UserClaimConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/UserClaimConfiguration.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Configurations/UserClaimConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/UserClaimConfiguration.cs
diff --git a/src/Services/Identity/src/Identity/Data/Configurations/UserConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/UserConfiguration.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Configurations/UserConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/UserConfiguration.cs
diff --git a/src/Services/Identity/src/Identity/Data/Configurations/UserLoginConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/UserLoginConfiguration.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Configurations/UserLoginConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/UserLoginConfiguration.cs
diff --git a/src/Services/Identity/src/Identity/Data/Configurations/UserRoleConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/UserRoleConfiguration.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Configurations/UserRoleConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/UserRoleConfiguration.cs
diff --git a/src/Services/Identity/src/Identity/Data/Configurations/UserTokenConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/UserTokenConfiguration.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Configurations/UserTokenConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Configurations/UserTokenConfiguration.cs
diff --git a/src/Services/Identity/src/Identity/Data/DesignTimeDbContextFactory.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/DesignTimeDbContextFactory.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/DesignTimeDbContextFactory.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/DesignTimeDbContextFactory.cs
diff --git a/src/Services/Identity/src/Identity/Data/IdentityContext.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/IdentityContext.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/IdentityContext.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/IdentityContext.cs
diff --git a/src/Services/Identity/src/Identity/Data/Migrations/20230331193410_initial.Designer.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Migrations/20230331193410_initial.Designer.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Migrations/20230331193410_initial.Designer.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Migrations/20230331193410_initial.Designer.cs
diff --git a/src/Services/Identity/src/Identity/Data/Migrations/20230331193410_initial.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Migrations/20230331193410_initial.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Migrations/20230331193410_initial.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Migrations/20230331193410_initial.cs
diff --git a/src/Services/Identity/src/Identity/Data/Migrations/IdentityContextModelSnapshot.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Migrations/IdentityContextModelSnapshot.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Migrations/IdentityContextModelSnapshot.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Migrations/IdentityContextModelSnapshot.cs
diff --git a/src/Services/Identity/src/Identity/Data/Seed/IdentityDataSeeder.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Seed/IdentityDataSeeder.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Seed/IdentityDataSeeder.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Seed/IdentityDataSeeder.cs
diff --git a/src/Services/Identity/src/Identity/Data/Seed/InitialData.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Seed/InitialData.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/Seed/InitialData.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/Seed/InitialData.cs
diff --git a/src/Services/Identity/src/Identity/Data/readme.md b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/readme.md
similarity index 100%
rename from src/Services/Identity/src/Identity/Data/readme.md
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Data/readme.md
diff --git a/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Extensions/Infrastructure/IdentityServerExtensions.cs
diff --git a/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Extensions/Infrastructure/InfrastructureExtensions.cs
diff --git a/src/Services/Identity/src/Identity/Extensions/Infrastructure/MediatRExtensions.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Extensions/Infrastructure/MediatRExtensions.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Extensions/Infrastructure/MediatRExtensions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Extensions/Infrastructure/MediatRExtensions.cs
diff --git a/src/Services/Identity/src/Identity/Identity.csproj b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity.csproj
similarity index 87%
rename from src/Services/Identity/src/Identity/Identity.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity.csproj
index 2ac9aa6..952e036 100644
--- a/src/Services/Identity/src/Identity/Identity.csproj
+++ b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity.csproj
@@ -7,10 +7,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Data\Migrations" />
   </ItemGroup>
@@ -21,4 +17,8 @@
     </AssemblyAttribute>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Services/Identity/src/Identity/Identity/Constants/Constants.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Constants/Constants.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Constants/Constants.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Constants/Constants.cs
diff --git a/src/Services/Identity/src/Identity/Identity/Exceptions/RegisterIdentityUserException.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Exceptions/RegisterIdentityUserException.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Exceptions/RegisterIdentityUserException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Exceptions/RegisterIdentityUserException.cs
diff --git a/src/Services/Identity/src/Identity/Identity/Features/IdentityMappings.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Features/IdentityMappings.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Features/IdentityMappings.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Features/IdentityMappings.cs
diff --git a/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs
diff --git a/src/Services/Identity/src/Identity/Identity/Models/Role.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/Role.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Models/Role.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/Role.cs
diff --git a/src/Services/Identity/src/Identity/Identity/Models/RoleClaim.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/RoleClaim.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Models/RoleClaim.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/RoleClaim.cs
diff --git a/src/Services/Identity/src/Identity/Identity/Models/User.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/User.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Models/User.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/User.cs
diff --git a/src/Services/Identity/src/Identity/Identity/Models/UserClaim.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/UserClaim.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Models/UserClaim.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/UserClaim.cs
diff --git a/src/Services/Identity/src/Identity/Identity/Models/UserLogin.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/UserLogin.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Models/UserLogin.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/UserLogin.cs
diff --git a/src/Services/Identity/src/Identity/Identity/Models/UserRole.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/UserRole.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Models/UserRole.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/UserRole.cs
diff --git a/src/Services/Identity/src/Identity/Identity/Models/UserToken.cs b/3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/UserToken.cs
similarity index 100%
rename from src/Services/Identity/src/Identity/Identity/Models/UserToken.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/src/Identity/Identity/Models/UserToken.cs
diff --git a/src/Services/Identity/tests/IntegrationTest/Fakes/FakeRegisterNewUserCommand.cs b/3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/Fakes/FakeRegisterNewUserCommand.cs
similarity index 100%
rename from src/Services/Identity/tests/IntegrationTest/Fakes/FakeRegisterNewUserCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/Fakes/FakeRegisterNewUserCommand.cs
diff --git a/src/Services/Identity/tests/IntegrationTest/Identity/Features/RegisterNewUserTests.cs b/3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/Identity/Features/RegisterNewUserTests.cs
similarity index 100%
rename from src/Services/Identity/tests/IntegrationTest/Identity/Features/RegisterNewUserTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/Identity/Features/RegisterNewUserTests.cs
diff --git a/src/Services/Identity/tests/IntegrationTest/IdentityIntegrationTestBase.cs b/3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/IdentityIntegrationTestBase.cs
similarity index 100%
rename from src/Services/Identity/tests/IntegrationTest/IdentityIntegrationTestBase.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/IdentityIntegrationTestBase.cs
diff --git a/src/Services/Identity/tests/IntegrationTest/IdentityTestDataSeeder.cs b/3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/IdentityTestDataSeeder.cs
similarity index 100%
rename from src/Services/Identity/tests/IntegrationTest/IdentityTestDataSeeder.cs
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/IdentityTestDataSeeder.cs
diff --git a/src/Services/Identity/tests/IntegrationTest/Integration.Test.csproj b/3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/Integration.Test.csproj
similarity index 100%
rename from src/Services/Identity/tests/IntegrationTest/Integration.Test.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/Integration.Test.csproj
diff --git a/src/Services/Identity/tests/IntegrationTest/xunit.runner.json b/3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/xunit.runner.json
similarity index 100%
rename from src/Services/Identity/tests/IntegrationTest/xunit.runner.json
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/IntegrationTest/xunit.runner.json
diff --git a/src/Services/Identity/tests/PerformanceTest/.openapi-generator-ignore b/3-Microservices-Architecture-Style/src/Services/Identity/tests/PerformanceTest/.openapi-generator-ignore
similarity index 100%
rename from src/Services/Identity/tests/PerformanceTest/.openapi-generator-ignore
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/PerformanceTest/.openapi-generator-ignore
diff --git a/src/Services/Identity/tests/PerformanceTest/.openapi-generator/FILES b/3-Microservices-Architecture-Style/src/Services/Identity/tests/PerformanceTest/.openapi-generator/FILES
similarity index 100%
rename from src/Services/Identity/tests/PerformanceTest/.openapi-generator/FILES
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/PerformanceTest/.openapi-generator/FILES
diff --git a/src/Services/Identity/tests/PerformanceTest/.openapi-generator/VERSION b/3-Microservices-Architecture-Style/src/Services/Identity/tests/PerformanceTest/.openapi-generator/VERSION
similarity index 100%
rename from src/Services/Identity/tests/PerformanceTest/.openapi-generator/VERSION
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/PerformanceTest/.openapi-generator/VERSION
diff --git a/src/Services/Identity/tests/PerformanceTest/README.md b/3-Microservices-Architecture-Style/src/Services/Identity/tests/PerformanceTest/README.md
similarity index 100%
rename from src/Services/Identity/tests/PerformanceTest/README.md
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/PerformanceTest/README.md
diff --git a/src/Services/Identity/tests/PerformanceTest/script.js b/3-Microservices-Architecture-Style/src/Services/Identity/tests/PerformanceTest/script.js
similarity index 100%
rename from src/Services/Identity/tests/PerformanceTest/script.js
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/PerformanceTest/script.js
diff --git a/src/Services/Identity/tests/tests.sln b/3-Microservices-Architecture-Style/src/Services/Identity/tests/tests.sln
similarity index 100%
rename from src/Services/Identity/tests/tests.sln
rename to 3-Microservices-Architecture-Style/src/Services/Identity/tests/tests.sln
diff --git a/3-Microservices-Architecture-Style/src/Services/Passenger/Dockerfile b/3-Microservices-Architecture-Style/src/Services/Passenger/Dockerfile
new file mode 100644
index 0000000..e536cbd
--- /dev/null
+++ b/3-Microservices-Architecture-Style/src/Services/Passenger/Dockerfile
@@ -0,0 +1,47 @@
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
+WORKDIR /
+
+COPY ./.editorconfig ./
+COPY ./global.json ./
+COPY ./Directory.Build.props ./
+
+# Setup working directory for the project
+COPY ./BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passenger.csproj ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/
+COPY ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/
+
+
+# Restore nuget packages
+RUN dotnet restore ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
+
+# Copy project files
+COPY ./BuildingBlocks ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/  ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/
+COPY ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/  ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/
+
+# Build project with Release configuration
+# and no restore, as we did it already
+
+RUN ls
+RUN dotnet build  -c Release --no-restore ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
+
+WORKDIR /3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api
+
+# Publish project to output folder
+# and no build, as we did it already
+RUN dotnet publish -c Release --no-build -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
+
+# Setup working directory for the project
+WORKDIR /
+COPY --from=builder /3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/out  .
+
+ENV ASPNETCORE_URLS https://*:443, http://*:80
+ENV ASPNETCORE_ENVIRONMENT docker
+
+EXPOSE 80
+EXPOSE 443
+
+ENTRYPOINT ["dotnet", "Passenger.Api.dll"]
+
diff --git a/3-Microservices-Architecture-Style/src/Services/Passenger/dev.Dockerfile b/3-Microservices-Architecture-Style/src/Services/Passenger/dev.Dockerfile
new file mode 100644
index 0000000..3fd1399
--- /dev/null
+++ b/3-Microservices-Architecture-Style/src/Services/Passenger/dev.Dockerfile
@@ -0,0 +1,50 @@
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
+WORKDIR /
+
+COPY ./.editorconfig ./
+COPY ./global.json ./
+COPY ./Directory.Build.props ./
+
+# Setup working directory for the project
+COPY ./BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passenger.csproj ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/
+COPY ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/
+
+
+# Restore nuget packages
+RUN --mount=type=cache,id=passenger_nuget,target=/root/.nuget/packages \
+    dotnet restore ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
+
+# Copy project files
+COPY ./BuildingBlocks ./BuildingBlocks/
+COPY ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/  ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/
+COPY ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/  ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/
+
+# Build project with Release configuration
+# and no restore, as we did it already
+
+RUN ls
+RUN --mount=type=cache,id=passenger_nuget,target=/root/.nuget/packages \
+    dotnet build  -c Release --no-restore ./3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
+
+WORKDIR /3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api
+
+# Publish project to output folder
+# and no build, as we did it already
+RUN --mount=type=cache,id=passenger_nuget,target=/root/.nuget/packages \
+    dotnet publish -c Release --no-build -o out
+
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
+
+# Setup working directory for the project
+WORKDIR /
+COPY --from=builder /3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/out  .
+
+ENV ASPNETCORE_URLS https://*:443, http://*:80
+ENV ASPNETCORE_ENVIRONMENT docker
+
+EXPOSE 80
+EXPOSE 443
+
+ENTRYPOINT ["dotnet", "Passenger.Api.dll"]
+
diff --git a/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
similarity index 100%
rename from src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
diff --git a/src/Services/Passenger/src/Passenger.Api/Program.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Program.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger.Api/Program.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Program.cs
diff --git a/src/Services/Passenger/src/Passenger.Api/Properties/launchSettings.json b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Properties/launchSettings.json
similarity index 100%
rename from src/Services/Passenger/src/Passenger.Api/Properties/launchSettings.json
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/Properties/launchSettings.json
diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.Development.json b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/appsettings.Development.json
similarity index 100%
rename from src/Services/Passenger/src/Passenger.Api/appsettings.Development.json
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/appsettings.Development.json
diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json
similarity index 100%
rename from src/Services/Passenger/src/Passenger.Api/appsettings.docker.json
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/appsettings.docker.json
diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.json b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/appsettings.json
similarity index 100%
rename from src/Services/Passenger/src/Passenger.Api/appsettings.json
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/appsettings.json
diff --git a/src/Services/Passenger/src/Passenger.Api/appsettings.test.json b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/appsettings.test.json
similarity index 100%
rename from src/Services/Passenger/src/Passenger.Api/appsettings.test.json
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger.Api/appsettings.test.json
diff --git a/src/Services/Passenger/src/Passenger/Data/Configurations/PassengerConfiguration.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/Configurations/PassengerConfiguration.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Data/Configurations/PassengerConfiguration.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/Configurations/PassengerConfiguration.cs
diff --git a/src/Services/Passenger/src/Passenger/Data/DesignTimeDbContextFactory.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/DesignTimeDbContextFactory.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Data/DesignTimeDbContextFactory.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/DesignTimeDbContextFactory.cs
diff --git a/src/Services/Passenger/src/Passenger/Data/Migrations/20230611213031_initial.Designer.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/Migrations/20230611213031_initial.Designer.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Data/Migrations/20230611213031_initial.Designer.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/Migrations/20230611213031_initial.Designer.cs
diff --git a/src/Services/Passenger/src/Passenger/Data/Migrations/20230611213031_initial.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/Migrations/20230611213031_initial.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Data/Migrations/20230611213031_initial.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/Migrations/20230611213031_initial.cs
diff --git a/src/Services/Passenger/src/Passenger/Data/Migrations/PassengerDbContextModelSnapshot.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/Migrations/PassengerDbContextModelSnapshot.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Data/Migrations/PassengerDbContextModelSnapshot.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/Migrations/PassengerDbContextModelSnapshot.cs
diff --git a/src/Services/Passenger/src/Passenger/Data/PassengerDbContext.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/PassengerDbContext.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Data/PassengerDbContext.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/PassengerDbContext.cs
diff --git a/src/Services/Passenger/src/Passenger/Data/PassengerReadDbContext.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/PassengerReadDbContext.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Data/PassengerReadDbContext.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/PassengerReadDbContext.cs
diff --git a/src/Services/Passenger/src/Passenger/Data/readme.md b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/readme.md
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Data/readme.md
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Data/readme.md
diff --git a/src/Services/Passenger/src/Passenger/EventMapper.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/EventMapper.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/EventMapper.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/EventMapper.cs
diff --git a/src/Services/Passenger/src/Passenger/Exceptions/InvalidPassengerIdException.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Exceptions/InvalidPassengerIdException.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Exceptions/InvalidPassengerIdException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Exceptions/InvalidPassengerIdException.cs
diff --git a/src/Services/Passenger/src/Passenger/Extensions/Infrastructure/InfrastructureExtensions.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Extensions/Infrastructure/InfrastructureExtensions.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Extensions/Infrastructure/InfrastructureExtensions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Extensions/Infrastructure/InfrastructureExtensions.cs
diff --git a/src/Services/Passenger/src/Passenger/Extensions/Infrastructure/MediatRExtensions.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Extensions/Infrastructure/MediatRExtensions.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Extensions/Infrastructure/MediatRExtensions.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Extensions/Infrastructure/MediatRExtensions.cs
diff --git a/src/Services/Passenger/src/Passenger/GrpcServer/Protos/passenger.proto b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/GrpcServer/Protos/passenger.proto
similarity index 100%
rename from src/Services/Passenger/src/Passenger/GrpcServer/Protos/passenger.proto
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/GrpcServer/Protos/passenger.proto
diff --git a/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs
diff --git a/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/PassengerCreatedDomainEvent.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/PassengerCreatedDomainEvent.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/PassengerCreatedDomainEvent.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/PassengerCreatedDomainEvent.cs
diff --git a/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/RegisterNewUser.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/RegisterNewUser.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/RegisterNewUser.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisteringNewUser/V1/RegisterNewUser.cs
diff --git a/src/Services/Passenger/src/Passenger/Passenger.csproj b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passenger.csproj
similarity index 89%
rename from src/Services/Passenger/src/Passenger/Passenger.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passenger.csproj
index db24d60..e914cdd 100644
--- a/src/Services/Passenger/src/Passenger/Passenger.csproj
+++ b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passenger.csproj
@@ -12,10 +12,6 @@
     <Folder Include="Data\Migrations" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Protobuf Include="GrpcServer\Protos\passenger.proto" GrpcServices="Both" />
   </ItemGroup>
@@ -26,4 +22,8 @@
     </AssemblyAttribute>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\..\BuildingBlocks\BuildingBlocks.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Services/Passenger/src/Passenger/PassengerRoot.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/PassengerRoot.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/PassengerRoot.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/PassengerRoot.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Dtos/PassengerDto.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Dtos/PassengerDto.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Dtos/PassengerDto.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Dtos/PassengerDto.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Enums/PassengerType.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Enums/PassengerType.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Enums/PassengerType.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Enums/PassengerType.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidAgeException.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidAgeException.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidAgeException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidAgeException.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidNameException.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidNameException.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidNameException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidNameException.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidPassportNumberException.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidPassportNumberException.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidPassportNumberException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Exceptions/InvalidPassportNumberException.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerAlreadyExist.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerAlreadyExist.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerAlreadyExist.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerAlreadyExist.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerNotFoundException.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerNotFoundException.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerNotFoundException.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerNotFoundException.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassengerMongo.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassengerMongo.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassengerMongo.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassengerMongo.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/V1/GetPassengerById.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/Models/PassengerReadModel.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Models/PassengerReadModel.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/Models/PassengerReadModel.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/Models/PassengerReadModel.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Age.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Age.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Age.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Age.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Name.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Name.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Name.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/Name.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs
diff --git a/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassportNumber.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassportNumber.cs
similarity index 100%
rename from src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassportNumber.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassportNumber.cs
diff --git a/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerCommand.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerCommand.cs
similarity index 100%
rename from src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerCommand.cs
diff --git a/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerMongoCommand.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerMongoCommand.cs
similarity index 100%
rename from src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerMongoCommand.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerMongoCommand.cs
diff --git a/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeUserCreated.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeUserCreated.cs
similarity index 100%
rename from src/Services/Passenger/tests/IntegrationTest/Fakes/FakeUserCreated.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeUserCreated.cs
diff --git a/src/Services/Passenger/tests/IntegrationTest/Integration.Test.csproj b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Integration.Test.csproj
similarity index 100%
rename from src/Services/Passenger/tests/IntegrationTest/Integration.Test.csproj
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Integration.Test.csproj
diff --git a/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/CompleteRegisterPassengerTests.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/CompleteRegisterPassengerTests.cs
similarity index 100%
rename from src/Services/Passenger/tests/IntegrationTest/Passenger/Features/CompleteRegisterPassengerTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/CompleteRegisterPassengerTests.cs
diff --git a/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs
similarity index 100%
rename from src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs
diff --git a/src/Services/Passenger/tests/IntegrationTest/PassengerIntegrationTestBase.cs b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/PassengerIntegrationTestBase.cs
similarity index 100%
rename from src/Services/Passenger/tests/IntegrationTest/PassengerIntegrationTestBase.cs
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/PassengerIntegrationTestBase.cs
diff --git a/src/Services/Passenger/tests/IntegrationTest/xunit.runner.json b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/xunit.runner.json
similarity index 100%
rename from src/Services/Passenger/tests/IntegrationTest/xunit.runner.json
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/IntegrationTest/xunit.runner.json
diff --git a/src/Services/Passenger/tests/PerformanceTest/.openapi-generator-ignore b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/PerformanceTest/.openapi-generator-ignore
similarity index 100%
rename from src/Services/Passenger/tests/PerformanceTest/.openapi-generator-ignore
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/PerformanceTest/.openapi-generator-ignore
diff --git a/src/Services/Passenger/tests/PerformanceTest/.openapi-generator/FILES b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/PerformanceTest/.openapi-generator/FILES
similarity index 100%
rename from src/Services/Passenger/tests/PerformanceTest/.openapi-generator/FILES
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/PerformanceTest/.openapi-generator/FILES
diff --git a/src/Services/Passenger/tests/PerformanceTest/.openapi-generator/VERSION b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/PerformanceTest/.openapi-generator/VERSION
similarity index 100%
rename from src/Services/Passenger/tests/PerformanceTest/.openapi-generator/VERSION
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/PerformanceTest/.openapi-generator/VERSION
diff --git a/src/Services/Passenger/tests/PerformanceTest/README.md b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/PerformanceTest/README.md
similarity index 100%
rename from src/Services/Passenger/tests/PerformanceTest/README.md
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/PerformanceTest/README.md
diff --git a/src/Services/Passenger/tests/PerformanceTest/script.js b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/PerformanceTest/script.js
similarity index 100%
rename from src/Services/Passenger/tests/PerformanceTest/script.js
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/PerformanceTest/script.js
diff --git a/src/Services/Passenger/tests/tests.sln b/3-Microservices-Architecture-Style/src/Services/Passenger/tests/tests.sln
similarity index 100%
rename from src/Services/Passenger/tests/tests.sln
rename to 3-Microservices-Architecture-Style/src/Services/Passenger/tests/tests.sln
diff --git a/src/BuildingBlocks/BuildingBlocks.csproj b/BuildingBlocks/BuildingBlocks.csproj
similarity index 100%
rename from src/BuildingBlocks/BuildingBlocks.csproj
rename to BuildingBlocks/BuildingBlocks.csproj
diff --git a/src/BuildingBlocks/Caching/CachingBehavior.cs b/BuildingBlocks/Caching/CachingBehavior.cs
similarity index 100%
rename from src/BuildingBlocks/Caching/CachingBehavior.cs
rename to BuildingBlocks/Caching/CachingBehavior.cs
diff --git a/src/BuildingBlocks/Caching/ICacheRequest.cs b/BuildingBlocks/Caching/ICacheRequest.cs
similarity index 100%
rename from src/BuildingBlocks/Caching/ICacheRequest.cs
rename to BuildingBlocks/Caching/ICacheRequest.cs
diff --git a/src/BuildingBlocks/Caching/IInvalidateCacheRequest.cs b/BuildingBlocks/Caching/IInvalidateCacheRequest.cs
similarity index 100%
rename from src/BuildingBlocks/Caching/IInvalidateCacheRequest.cs
rename to BuildingBlocks/Caching/IInvalidateCacheRequest.cs
diff --git a/src/BuildingBlocks/Caching/InvalidateCachingBehavior.cs b/BuildingBlocks/Caching/InvalidateCachingBehavior.cs
similarity index 100%
rename from src/BuildingBlocks/Caching/InvalidateCachingBehavior.cs
rename to BuildingBlocks/Caching/InvalidateCachingBehavior.cs
diff --git a/src/BuildingBlocks/Contracts/EventBus.Messages/FlighContracts.cs b/BuildingBlocks/Contracts/EventBus.Messages/FlighContracts.cs
similarity index 100%
rename from src/BuildingBlocks/Contracts/EventBus.Messages/FlighContracts.cs
rename to BuildingBlocks/Contracts/EventBus.Messages/FlighContracts.cs
diff --git a/src/BuildingBlocks/Contracts/EventBus.Messages/IdentityContracts.cs b/BuildingBlocks/Contracts/EventBus.Messages/IdentityContracts.cs
similarity index 100%
rename from src/BuildingBlocks/Contracts/EventBus.Messages/IdentityContracts.cs
rename to BuildingBlocks/Contracts/EventBus.Messages/IdentityContracts.cs
diff --git a/src/BuildingBlocks/Contracts/EventBus.Messages/PassengerContracts.cs b/BuildingBlocks/Contracts/EventBus.Messages/PassengerContracts.cs
similarity index 100%
rename from src/BuildingBlocks/Contracts/EventBus.Messages/PassengerContracts.cs
rename to BuildingBlocks/Contracts/EventBus.Messages/PassengerContracts.cs
diff --git a/src/BuildingBlocks/Contracts/EventBus.Messages/ReservationContracts.cs b/BuildingBlocks/Contracts/EventBus.Messages/ReservationContracts.cs
similarity index 100%
rename from src/BuildingBlocks/Contracts/EventBus.Messages/ReservationContracts.cs
rename to BuildingBlocks/Contracts/EventBus.Messages/ReservationContracts.cs
diff --git a/src/BuildingBlocks/Core/CQRS/ICommand.cs b/BuildingBlocks/Core/CQRS/ICommand.cs
similarity index 100%
rename from src/BuildingBlocks/Core/CQRS/ICommand.cs
rename to BuildingBlocks/Core/CQRS/ICommand.cs
diff --git a/src/BuildingBlocks/Core/CQRS/ICommandHandler.cs b/BuildingBlocks/Core/CQRS/ICommandHandler.cs
similarity index 100%
rename from src/BuildingBlocks/Core/CQRS/ICommandHandler.cs
rename to BuildingBlocks/Core/CQRS/ICommandHandler.cs
diff --git a/src/BuildingBlocks/Core/CQRS/IQuery.cs b/BuildingBlocks/Core/CQRS/IQuery.cs
similarity index 100%
rename from src/BuildingBlocks/Core/CQRS/IQuery.cs
rename to BuildingBlocks/Core/CQRS/IQuery.cs
diff --git a/src/BuildingBlocks/Core/CQRS/IQueryHandler.cs b/BuildingBlocks/Core/CQRS/IQueryHandler.cs
similarity index 100%
rename from src/BuildingBlocks/Core/CQRS/IQueryHandler.cs
rename to BuildingBlocks/Core/CQRS/IQueryHandler.cs
diff --git a/src/BuildingBlocks/Core/Event/EventType.cs b/BuildingBlocks/Core/Event/EventType.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Event/EventType.cs
rename to BuildingBlocks/Core/Event/EventType.cs
diff --git a/src/BuildingBlocks/Core/Event/IDomainEvent.cs b/BuildingBlocks/Core/Event/IDomainEvent.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Event/IDomainEvent.cs
rename to BuildingBlocks/Core/Event/IDomainEvent.cs
diff --git a/src/BuildingBlocks/Core/Event/IEvent.cs b/BuildingBlocks/Core/Event/IEvent.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Event/IEvent.cs
rename to BuildingBlocks/Core/Event/IEvent.cs
diff --git a/src/BuildingBlocks/Core/Event/IHaveIntegrationEvent.cs b/BuildingBlocks/Core/Event/IHaveIntegrationEvent.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Event/IHaveIntegrationEvent.cs
rename to BuildingBlocks/Core/Event/IHaveIntegrationEvent.cs
diff --git a/src/BuildingBlocks/Core/Event/IIntegrationEvent.cs b/BuildingBlocks/Core/Event/IIntegrationEvent.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Event/IIntegrationEvent.cs
rename to BuildingBlocks/Core/Event/IIntegrationEvent.cs
diff --git a/src/BuildingBlocks/Core/Event/IInternalCommand.cs b/BuildingBlocks/Core/Event/IInternalCommand.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Event/IInternalCommand.cs
rename to BuildingBlocks/Core/Event/IInternalCommand.cs
diff --git a/src/BuildingBlocks/Core/Event/InternalCommand.cs b/BuildingBlocks/Core/Event/InternalCommand.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Event/InternalCommand.cs
rename to BuildingBlocks/Core/Event/InternalCommand.cs
diff --git a/src/BuildingBlocks/Core/Event/MessageEnvelope.cs b/BuildingBlocks/Core/Event/MessageEnvelope.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Event/MessageEnvelope.cs
rename to BuildingBlocks/Core/Event/MessageEnvelope.cs
diff --git a/src/BuildingBlocks/Core/EventDispatcher.cs b/BuildingBlocks/Core/EventDispatcher.cs
similarity index 100%
rename from src/BuildingBlocks/Core/EventDispatcher.cs
rename to BuildingBlocks/Core/EventDispatcher.cs
diff --git a/src/BuildingBlocks/Core/IEventDispatcher.cs b/BuildingBlocks/Core/IEventDispatcher.cs
similarity index 100%
rename from src/BuildingBlocks/Core/IEventDispatcher.cs
rename to BuildingBlocks/Core/IEventDispatcher.cs
diff --git a/src/BuildingBlocks/Core/IEventMapper.cs b/BuildingBlocks/Core/IEventMapper.cs
similarity index 100%
rename from src/BuildingBlocks/Core/IEventMapper.cs
rename to BuildingBlocks/Core/IEventMapper.cs
diff --git a/src/BuildingBlocks/Core/IntegrationEventWrapper.cs b/BuildingBlocks/Core/IntegrationEventWrapper.cs
similarity index 100%
rename from src/BuildingBlocks/Core/IntegrationEventWrapper.cs
rename to BuildingBlocks/Core/IntegrationEventWrapper.cs
diff --git a/src/BuildingBlocks/Core/Model/Aggregate.cs b/BuildingBlocks/Core/Model/Aggregate.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Model/Aggregate.cs
rename to BuildingBlocks/Core/Model/Aggregate.cs
diff --git a/src/BuildingBlocks/Core/Model/Entity.cs b/BuildingBlocks/Core/Model/Entity.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Model/Entity.cs
rename to BuildingBlocks/Core/Model/Entity.cs
diff --git a/src/BuildingBlocks/Core/Model/IAggregate.cs b/BuildingBlocks/Core/Model/IAggregate.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Model/IAggregate.cs
rename to BuildingBlocks/Core/Model/IAggregate.cs
diff --git a/src/BuildingBlocks/Core/Model/IEntity.cs b/BuildingBlocks/Core/Model/IEntity.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Model/IEntity.cs
rename to BuildingBlocks/Core/Model/IEntity.cs
diff --git a/src/BuildingBlocks/Core/Model/IVersion.cs b/BuildingBlocks/Core/Model/IVersion.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Model/IVersion.cs
rename to BuildingBlocks/Core/Model/IVersion.cs
diff --git a/src/BuildingBlocks/Core/Pagination/Extensions.cs b/BuildingBlocks/Core/Pagination/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Pagination/Extensions.cs
rename to BuildingBlocks/Core/Pagination/Extensions.cs
diff --git a/src/BuildingBlocks/Core/Pagination/IPageList.cs b/BuildingBlocks/Core/Pagination/IPageList.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Pagination/IPageList.cs
rename to BuildingBlocks/Core/Pagination/IPageList.cs
diff --git a/src/BuildingBlocks/Core/Pagination/IPageQuery.cs b/BuildingBlocks/Core/Pagination/IPageQuery.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Pagination/IPageQuery.cs
rename to BuildingBlocks/Core/Pagination/IPageQuery.cs
diff --git a/src/BuildingBlocks/Core/Pagination/IPageRequest.cs b/BuildingBlocks/Core/Pagination/IPageRequest.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Pagination/IPageRequest.cs
rename to BuildingBlocks/Core/Pagination/IPageRequest.cs
diff --git a/src/BuildingBlocks/Core/Pagination/PageList.cs b/BuildingBlocks/Core/Pagination/PageList.cs
similarity index 100%
rename from src/BuildingBlocks/Core/Pagination/PageList.cs
rename to BuildingBlocks/Core/Pagination/PageList.cs
diff --git a/src/BuildingBlocks/EFCore/AppDbContextBase.cs b/BuildingBlocks/EFCore/AppDbContextBase.cs
similarity index 100%
rename from src/BuildingBlocks/EFCore/AppDbContextBase.cs
rename to BuildingBlocks/EFCore/AppDbContextBase.cs
diff --git a/src/BuildingBlocks/EFCore/DesignTimeDbContextFactoryBase.cs b/BuildingBlocks/EFCore/DesignTimeDbContextFactoryBase.cs
similarity index 100%
rename from src/BuildingBlocks/EFCore/DesignTimeDbContextFactoryBase.cs
rename to BuildingBlocks/EFCore/DesignTimeDbContextFactoryBase.cs
diff --git a/src/BuildingBlocks/EFCore/EfTxBehavior.cs b/BuildingBlocks/EFCore/EfTxBehavior.cs
similarity index 100%
rename from src/BuildingBlocks/EFCore/EfTxBehavior.cs
rename to BuildingBlocks/EFCore/EfTxBehavior.cs
diff --git a/src/BuildingBlocks/EFCore/Extensions.cs b/BuildingBlocks/EFCore/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/EFCore/Extensions.cs
rename to BuildingBlocks/EFCore/Extensions.cs
diff --git a/src/BuildingBlocks/EFCore/IDataSeeder.cs b/BuildingBlocks/EFCore/IDataSeeder.cs
similarity index 100%
rename from src/BuildingBlocks/EFCore/IDataSeeder.cs
rename to BuildingBlocks/EFCore/IDataSeeder.cs
diff --git a/src/BuildingBlocks/EFCore/IDbContext.cs b/BuildingBlocks/EFCore/IDbContext.cs
similarity index 100%
rename from src/BuildingBlocks/EFCore/IDbContext.cs
rename to BuildingBlocks/EFCore/IDbContext.cs
diff --git a/src/BuildingBlocks/EFCore/ISeedManager.cs b/BuildingBlocks/EFCore/ISeedManager.cs
similarity index 100%
rename from src/BuildingBlocks/EFCore/ISeedManager.cs
rename to BuildingBlocks/EFCore/ISeedManager.cs
diff --git a/src/BuildingBlocks/EFCore/PostgresOptions.cs b/BuildingBlocks/EFCore/PostgresOptions.cs
similarity index 100%
rename from src/BuildingBlocks/EFCore/PostgresOptions.cs
rename to BuildingBlocks/EFCore/PostgresOptions.cs
diff --git a/src/BuildingBlocks/EFCore/SeedManagers.cs b/BuildingBlocks/EFCore/SeedManagers.cs
similarity index 100%
rename from src/BuildingBlocks/EFCore/SeedManagers.cs
rename to BuildingBlocks/EFCore/SeedManagers.cs
diff --git a/src/BuildingBlocks/EventStoreDB/BackgroundWorkers/BackgroundWorker.cs b/BuildingBlocks/EventStoreDB/BackgroundWorkers/BackgroundWorker.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/BackgroundWorkers/BackgroundWorker.cs
rename to BuildingBlocks/EventStoreDB/BackgroundWorkers/BackgroundWorker.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Config.cs b/BuildingBlocks/EventStoreDB/Config.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Config.cs
rename to BuildingBlocks/EventStoreDB/Config.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Events/AggregateEventSourcing.cs b/BuildingBlocks/EventStoreDB/Events/AggregateEventSourcing.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Events/AggregateEventSourcing.cs
rename to BuildingBlocks/EventStoreDB/Events/AggregateEventSourcing.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Events/AggregateStreamExtensions.cs b/BuildingBlocks/EventStoreDB/Events/AggregateStreamExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Events/AggregateStreamExtensions.cs
rename to BuildingBlocks/EventStoreDB/Events/AggregateStreamExtensions.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Events/EventTypeMapper.cs b/BuildingBlocks/EventStoreDB/Events/EventTypeMapper.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Events/EventTypeMapper.cs
rename to BuildingBlocks/EventStoreDB/Events/EventTypeMapper.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Events/IAggregateEventSourcing.cs b/BuildingBlocks/EventStoreDB/Events/IAggregateEventSourcing.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Events/IAggregateEventSourcing.cs
rename to BuildingBlocks/EventStoreDB/Events/IAggregateEventSourcing.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Events/IEventHandler.cs b/BuildingBlocks/EventStoreDB/Events/IEventHandler.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Events/IEventHandler.cs
rename to BuildingBlocks/EventStoreDB/Events/IEventHandler.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Events/IExternalEvent.cs b/BuildingBlocks/EventStoreDB/Events/IExternalEvent.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Events/IExternalEvent.cs
rename to BuildingBlocks/EventStoreDB/Events/IExternalEvent.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Events/IProjection.cs b/BuildingBlocks/EventStoreDB/Events/IProjection.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Events/IProjection.cs
rename to BuildingBlocks/EventStoreDB/Events/IProjection.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Events/StreamEvent.cs b/BuildingBlocks/EventStoreDB/Events/StreamEvent.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Events/StreamEvent.cs
rename to BuildingBlocks/EventStoreDB/Events/StreamEvent.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Events/StreamEventExtensions.cs b/BuildingBlocks/EventStoreDB/Events/StreamEventExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Events/StreamEventExtensions.cs
rename to BuildingBlocks/EventStoreDB/Events/StreamEventExtensions.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Events/StreamNameMapper.cs b/BuildingBlocks/EventStoreDB/Events/StreamNameMapper.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Events/StreamNameMapper.cs
rename to BuildingBlocks/EventStoreDB/Events/StreamNameMapper.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Extensions.cs b/BuildingBlocks/EventStoreDB/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Extensions.cs
rename to BuildingBlocks/EventStoreDB/Extensions.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Projections/IProjectionProcessor.cs b/BuildingBlocks/EventStoreDB/Projections/IProjectionProcessor.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Projections/IProjectionProcessor.cs
rename to BuildingBlocks/EventStoreDB/Projections/IProjectionProcessor.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Projections/IProjectionPublisher.cs b/BuildingBlocks/EventStoreDB/Projections/IProjectionPublisher.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Projections/IProjectionPublisher.cs
rename to BuildingBlocks/EventStoreDB/Projections/IProjectionPublisher.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Projections/ProjectionPublisher.cs b/BuildingBlocks/EventStoreDB/Projections/ProjectionPublisher.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Projections/ProjectionPublisher.cs
rename to BuildingBlocks/EventStoreDB/Projections/ProjectionPublisher.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Repository/EventStoreDBRepository.cs b/BuildingBlocks/EventStoreDB/Repository/EventStoreDBRepository.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Repository/EventStoreDBRepository.cs
rename to BuildingBlocks/EventStoreDB/Repository/EventStoreDBRepository.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Repository/RepositoryExtensions.cs b/BuildingBlocks/EventStoreDB/Repository/RepositoryExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Repository/RepositoryExtensions.cs
rename to BuildingBlocks/EventStoreDB/Repository/RepositoryExtensions.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Serialization/EventStoreDBSerializer.cs b/BuildingBlocks/EventStoreDB/Serialization/EventStoreDBSerializer.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Serialization/EventStoreDBSerializer.cs
rename to BuildingBlocks/EventStoreDB/Serialization/EventStoreDBSerializer.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Serialization/JsonObjectContractProvider.cs b/BuildingBlocks/EventStoreDB/Serialization/JsonObjectContractProvider.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Serialization/JsonObjectContractProvider.cs
rename to BuildingBlocks/EventStoreDB/Serialization/JsonObjectContractProvider.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Serialization/NonDefaultConstructorContractResolver.cs b/BuildingBlocks/EventStoreDB/Serialization/NonDefaultConstructorContractResolver.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Serialization/NonDefaultConstructorContractResolver.cs
rename to BuildingBlocks/EventStoreDB/Serialization/NonDefaultConstructorContractResolver.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Serialization/SerializationExtensions.cs b/BuildingBlocks/EventStoreDB/Serialization/SerializationExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Serialization/SerializationExtensions.cs
rename to BuildingBlocks/EventStoreDB/Serialization/SerializationExtensions.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Subscriptions/EventStoreDBSubscriptionCheckpointRepository.cs b/BuildingBlocks/EventStoreDB/Subscriptions/EventStoreDBSubscriptionCheckpointRepository.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Subscriptions/EventStoreDBSubscriptionCheckpointRepository.cs
rename to BuildingBlocks/EventStoreDB/Subscriptions/EventStoreDBSubscriptionCheckpointRepository.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Subscriptions/EventStoreDBSubscriptionToAll.cs b/BuildingBlocks/EventStoreDB/Subscriptions/EventStoreDBSubscriptionToAll.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Subscriptions/EventStoreDBSubscriptionToAll.cs
rename to BuildingBlocks/EventStoreDB/Subscriptions/EventStoreDBSubscriptionToAll.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Subscriptions/ISubscriptionCheckpointRepository.cs b/BuildingBlocks/EventStoreDB/Subscriptions/ISubscriptionCheckpointRepository.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Subscriptions/ISubscriptionCheckpointRepository.cs
rename to BuildingBlocks/EventStoreDB/Subscriptions/ISubscriptionCheckpointRepository.cs
diff --git a/src/BuildingBlocks/EventStoreDB/Subscriptions/InMemorySubscriptionCheckpointRepository.cs b/BuildingBlocks/EventStoreDB/Subscriptions/InMemorySubscriptionCheckpointRepository.cs
similarity index 100%
rename from src/BuildingBlocks/EventStoreDB/Subscriptions/InMemorySubscriptionCheckpointRepository.cs
rename to BuildingBlocks/EventStoreDB/Subscriptions/InMemorySubscriptionCheckpointRepository.cs
diff --git a/src/BuildingBlocks/Exception/AggregateNotFoundException.cs b/BuildingBlocks/Exception/AggregateNotFoundException.cs
similarity index 100%
rename from src/BuildingBlocks/Exception/AggregateNotFoundException.cs
rename to BuildingBlocks/Exception/AggregateNotFoundException.cs
diff --git a/src/BuildingBlocks/Exception/AppException.cs b/BuildingBlocks/Exception/AppException.cs
similarity index 100%
rename from src/BuildingBlocks/Exception/AppException.cs
rename to BuildingBlocks/Exception/AppException.cs
diff --git a/src/BuildingBlocks/Exception/BadRequestException.cs b/BuildingBlocks/Exception/BadRequestException.cs
similarity index 100%
rename from src/BuildingBlocks/Exception/BadRequestException.cs
rename to BuildingBlocks/Exception/BadRequestException.cs
diff --git a/src/BuildingBlocks/Exception/ConflictException.cs b/BuildingBlocks/Exception/ConflictException.cs
similarity index 100%
rename from src/BuildingBlocks/Exception/ConflictException.cs
rename to BuildingBlocks/Exception/ConflictException.cs
diff --git a/src/BuildingBlocks/Exception/CustomException.cs b/BuildingBlocks/Exception/CustomException.cs
similarity index 100%
rename from src/BuildingBlocks/Exception/CustomException.cs
rename to BuildingBlocks/Exception/CustomException.cs
diff --git a/src/BuildingBlocks/Exception/GrpcExceptionInterceptor.cs b/BuildingBlocks/Exception/GrpcExceptionInterceptor.cs
similarity index 100%
rename from src/BuildingBlocks/Exception/GrpcExceptionInterceptor.cs
rename to BuildingBlocks/Exception/GrpcExceptionInterceptor.cs
diff --git a/src/BuildingBlocks/Exception/InternalServerException.cs b/BuildingBlocks/Exception/InternalServerException.cs
similarity index 100%
rename from src/BuildingBlocks/Exception/InternalServerException.cs
rename to BuildingBlocks/Exception/InternalServerException.cs
diff --git a/src/BuildingBlocks/Exception/NotFoundException.cs b/BuildingBlocks/Exception/NotFoundException.cs
similarity index 100%
rename from src/BuildingBlocks/Exception/NotFoundException.cs
rename to BuildingBlocks/Exception/NotFoundException.cs
diff --git a/src/BuildingBlocks/Exception/ProblemDetailsWithCode.cs b/BuildingBlocks/Exception/ProblemDetailsWithCode.cs
similarity index 100%
rename from src/BuildingBlocks/Exception/ProblemDetailsWithCode.cs
rename to BuildingBlocks/Exception/ProblemDetailsWithCode.cs
diff --git a/src/BuildingBlocks/Exception/ValidationException.cs b/BuildingBlocks/Exception/ValidationException.cs
similarity index 100%
rename from src/BuildingBlocks/Exception/ValidationException.cs
rename to BuildingBlocks/Exception/ValidationException.cs
diff --git a/src/BuildingBlocks/HealthCheck/Extensions.cs b/BuildingBlocks/HealthCheck/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/HealthCheck/Extensions.cs
rename to BuildingBlocks/HealthCheck/Extensions.cs
diff --git a/src/BuildingBlocks/HealthCheck/HealthOptions.cs b/BuildingBlocks/HealthCheck/HealthOptions.cs
similarity index 100%
rename from src/BuildingBlocks/HealthCheck/HealthOptions.cs
rename to BuildingBlocks/HealthCheck/HealthOptions.cs
diff --git a/src/BuildingBlocks/Jwt/AuthHeaderHandler.cs b/BuildingBlocks/Jwt/AuthHeaderHandler.cs
similarity index 100%
rename from src/BuildingBlocks/Jwt/AuthHeaderHandler.cs
rename to BuildingBlocks/Jwt/AuthHeaderHandler.cs
diff --git a/src/BuildingBlocks/Jwt/JwtExtensions.cs b/BuildingBlocks/Jwt/JwtExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/Jwt/JwtExtensions.cs
rename to BuildingBlocks/Jwt/JwtExtensions.cs
diff --git a/src/BuildingBlocks/Logging/Extensions.cs b/BuildingBlocks/Logging/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/Logging/Extensions.cs
rename to BuildingBlocks/Logging/Extensions.cs
diff --git a/src/BuildingBlocks/Logging/FileOptions.cs b/BuildingBlocks/Logging/FileOptions.cs
similarity index 100%
rename from src/BuildingBlocks/Logging/FileOptions.cs
rename to BuildingBlocks/Logging/FileOptions.cs
diff --git a/src/BuildingBlocks/Logging/LogEnrichHelper.cs b/BuildingBlocks/Logging/LogEnrichHelper.cs
similarity index 100%
rename from src/BuildingBlocks/Logging/LogEnrichHelper.cs
rename to BuildingBlocks/Logging/LogEnrichHelper.cs
diff --git a/src/BuildingBlocks/Logging/LogOptions.cs b/BuildingBlocks/Logging/LogOptions.cs
similarity index 100%
rename from src/BuildingBlocks/Logging/LogOptions.cs
rename to BuildingBlocks/Logging/LogOptions.cs
diff --git a/src/BuildingBlocks/Logging/LoggingBehavior.cs b/BuildingBlocks/Logging/LoggingBehavior.cs
similarity index 100%
rename from src/BuildingBlocks/Logging/LoggingBehavior.cs
rename to BuildingBlocks/Logging/LoggingBehavior.cs
diff --git a/src/BuildingBlocks/Mapster/Extensions.cs b/BuildingBlocks/Mapster/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/Mapster/Extensions.cs
rename to BuildingBlocks/Mapster/Extensions.cs
diff --git a/src/BuildingBlocks/MassTransit/ConsumeFilter.cs b/BuildingBlocks/MassTransit/ConsumeFilter.cs
similarity index 100%
rename from src/BuildingBlocks/MassTransit/ConsumeFilter.cs
rename to BuildingBlocks/MassTransit/ConsumeFilter.cs
diff --git a/src/BuildingBlocks/MassTransit/Extensions.cs b/BuildingBlocks/MassTransit/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/MassTransit/Extensions.cs
rename to BuildingBlocks/MassTransit/Extensions.cs
diff --git a/src/BuildingBlocks/MassTransit/RabbitMqOptions.cs b/BuildingBlocks/MassTransit/RabbitMqOptions.cs
similarity index 100%
rename from src/BuildingBlocks/MassTransit/RabbitMqOptions.cs
rename to BuildingBlocks/MassTransit/RabbitMqOptions.cs
diff --git a/src/BuildingBlocks/Mongo/Extensions.cs b/BuildingBlocks/Mongo/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/Extensions.cs
rename to BuildingBlocks/Mongo/Extensions.cs
diff --git a/src/BuildingBlocks/Mongo/IMongoDbContext.cs b/BuildingBlocks/Mongo/IMongoDbContext.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/IMongoDbContext.cs
rename to BuildingBlocks/Mongo/IMongoDbContext.cs
diff --git a/src/BuildingBlocks/Mongo/IMongoRepository.cs b/BuildingBlocks/Mongo/IMongoRepository.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/IMongoRepository.cs
rename to BuildingBlocks/Mongo/IMongoRepository.cs
diff --git a/src/BuildingBlocks/Mongo/IMongoUnitOfWork.cs b/BuildingBlocks/Mongo/IMongoUnitOfWork.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/IMongoUnitOfWork.cs
rename to BuildingBlocks/Mongo/IMongoUnitOfWork.cs
diff --git a/src/BuildingBlocks/Mongo/IRepository.cs b/BuildingBlocks/Mongo/IRepository.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/IRepository.cs
rename to BuildingBlocks/Mongo/IRepository.cs
diff --git a/src/BuildingBlocks/Mongo/ITransactionAble.cs b/BuildingBlocks/Mongo/ITransactionAble.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/ITransactionAble.cs
rename to BuildingBlocks/Mongo/ITransactionAble.cs
diff --git a/src/BuildingBlocks/Mongo/IUnitOfWork.cs b/BuildingBlocks/Mongo/IUnitOfWork.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/IUnitOfWork.cs
rename to BuildingBlocks/Mongo/IUnitOfWork.cs
diff --git a/src/BuildingBlocks/Mongo/ImmutablePocoConvention.cs b/BuildingBlocks/Mongo/ImmutablePocoConvention.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/ImmutablePocoConvention.cs
rename to BuildingBlocks/Mongo/ImmutablePocoConvention.cs
diff --git a/src/BuildingBlocks/Mongo/MicroBootstrap.Persistence.Mongo.csproj b/BuildingBlocks/Mongo/MicroBootstrap.Persistence.Mongo.csproj
similarity index 100%
rename from src/BuildingBlocks/Mongo/MicroBootstrap.Persistence.Mongo.csproj
rename to BuildingBlocks/Mongo/MicroBootstrap.Persistence.Mongo.csproj
diff --git a/src/BuildingBlocks/Mongo/MongoDbContext.cs b/BuildingBlocks/Mongo/MongoDbContext.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/MongoDbContext.cs
rename to BuildingBlocks/Mongo/MongoDbContext.cs
diff --git a/src/BuildingBlocks/Mongo/MongoOptions.cs b/BuildingBlocks/Mongo/MongoOptions.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/MongoOptions.cs
rename to BuildingBlocks/Mongo/MongoOptions.cs
diff --git a/src/BuildingBlocks/Mongo/MongoRepository.cs b/BuildingBlocks/Mongo/MongoRepository.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/MongoRepository.cs
rename to BuildingBlocks/Mongo/MongoRepository.cs
diff --git a/src/BuildingBlocks/Mongo/MongoUnitOfWork.cs b/BuildingBlocks/Mongo/MongoUnitOfWork.cs
similarity index 100%
rename from src/BuildingBlocks/Mongo/MongoUnitOfWork.cs
rename to BuildingBlocks/Mongo/MongoUnitOfWork.cs
diff --git a/src/BuildingBlocks/OpenApi/Extensions.cs b/BuildingBlocks/OpenApi/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/OpenApi/Extensions.cs
rename to BuildingBlocks/OpenApi/Extensions.cs
diff --git a/src/BuildingBlocks/OpenApi/SecuritySchemeDocumentTransformer.cs b/BuildingBlocks/OpenApi/SecuritySchemeDocumentTransformer.cs
similarity index 100%
rename from src/BuildingBlocks/OpenApi/SecuritySchemeDocumentTransformer.cs
rename to BuildingBlocks/OpenApi/SecuritySchemeDocumentTransformer.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/ActivityExtensions.cs b/BuildingBlocks/OpenTelemetryCollector/ActivityExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/ActivityExtensions.cs
rename to BuildingBlocks/OpenTelemetryCollector/ActivityExtensions.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/ActivityInfo.cs b/BuildingBlocks/OpenTelemetryCollector/ActivityInfo.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/ActivityInfo.cs
rename to BuildingBlocks/OpenTelemetryCollector/ActivityInfo.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/Behaviors/ObservabilityPipelineBehavior.cs b/BuildingBlocks/OpenTelemetryCollector/Behaviors/ObservabilityPipelineBehavior.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/Behaviors/ObservabilityPipelineBehavior.cs
rename to BuildingBlocks/OpenTelemetryCollector/Behaviors/ObservabilityPipelineBehavior.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Commands/CommandHandlerActivity.cs b/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Commands/CommandHandlerActivity.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Commands/CommandHandlerActivity.cs
rename to BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Commands/CommandHandlerActivity.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Commands/CommandHandlerMetrics.cs b/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Commands/CommandHandlerMetrics.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Commands/CommandHandlerMetrics.cs
rename to BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Commands/CommandHandlerMetrics.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Query/QueryHandlerActivity.cs b/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Query/QueryHandlerActivity.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Query/QueryHandlerActivity.cs
rename to BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Query/QueryHandlerActivity.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Query/QueryHandlerMetrics.cs b/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Query/QueryHandlerMetrics.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Query/QueryHandlerMetrics.cs
rename to BuildingBlocks/OpenTelemetryCollector/CoreDiagnostics/Query/QueryHandlerMetrics.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/CreateActivityInfo.cs b/BuildingBlocks/OpenTelemetryCollector/CreateActivityInfo.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/CreateActivityInfo.cs
rename to BuildingBlocks/OpenTelemetryCollector/CreateActivityInfo.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/DiagnosticsProvider/CustomeDiagnosticsProvider.cs b/BuildingBlocks/OpenTelemetryCollector/DiagnosticsProvider/CustomeDiagnosticsProvider.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/DiagnosticsProvider/CustomeDiagnosticsProvider.cs
rename to BuildingBlocks/OpenTelemetryCollector/DiagnosticsProvider/CustomeDiagnosticsProvider.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/DiagnosticsProvider/IDiagnosticsProvider.cs b/BuildingBlocks/OpenTelemetryCollector/DiagnosticsProvider/IDiagnosticsProvider.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/DiagnosticsProvider/IDiagnosticsProvider.cs
rename to BuildingBlocks/OpenTelemetryCollector/DiagnosticsProvider/IDiagnosticsProvider.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/Extensions.cs b/BuildingBlocks/OpenTelemetryCollector/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/Extensions.cs
rename to BuildingBlocks/OpenTelemetryCollector/Extensions.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/ObservabilityConstant.cs b/BuildingBlocks/OpenTelemetryCollector/ObservabilityConstant.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/ObservabilityConstant.cs
rename to BuildingBlocks/OpenTelemetryCollector/ObservabilityConstant.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/ObservabilityOptions.cs b/BuildingBlocks/OpenTelemetryCollector/ObservabilityOptions.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/ObservabilityOptions.cs
rename to BuildingBlocks/OpenTelemetryCollector/ObservabilityOptions.cs
diff --git a/src/BuildingBlocks/OpenTelemetryCollector/TelemetryTags.cs b/BuildingBlocks/OpenTelemetryCollector/TelemetryTags.cs
similarity index 100%
rename from src/BuildingBlocks/OpenTelemetryCollector/TelemetryTags.cs
rename to BuildingBlocks/OpenTelemetryCollector/TelemetryTags.cs
diff --git a/src/BuildingBlocks/PersistMessageProcessor/Extensions.cs b/BuildingBlocks/PersistMessageProcessor/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/PersistMessageProcessor/Extensions.cs
rename to BuildingBlocks/PersistMessageProcessor/Extensions.cs
diff --git a/src/BuildingBlocks/PersistMessageProcessor/IPersistMessageDbContext.cs b/BuildingBlocks/PersistMessageProcessor/IPersistMessageDbContext.cs
similarity index 100%
rename from src/BuildingBlocks/PersistMessageProcessor/IPersistMessageDbContext.cs
rename to BuildingBlocks/PersistMessageProcessor/IPersistMessageDbContext.cs
diff --git a/src/BuildingBlocks/PersistMessageProcessor/IPersistMessageProcessor.cs b/BuildingBlocks/PersistMessageProcessor/IPersistMessageProcessor.cs
similarity index 100%
rename from src/BuildingBlocks/PersistMessageProcessor/IPersistMessageProcessor.cs
rename to BuildingBlocks/PersistMessageProcessor/IPersistMessageProcessor.cs
diff --git a/src/BuildingBlocks/PersistMessageProcessor/MessageDeliveryType.cs b/BuildingBlocks/PersistMessageProcessor/MessageDeliveryType.cs
similarity index 100%
rename from src/BuildingBlocks/PersistMessageProcessor/MessageDeliveryType.cs
rename to BuildingBlocks/PersistMessageProcessor/MessageDeliveryType.cs
diff --git a/src/BuildingBlocks/PersistMessageProcessor/MessageStatus.cs b/BuildingBlocks/PersistMessageProcessor/MessageStatus.cs
similarity index 100%
rename from src/BuildingBlocks/PersistMessageProcessor/MessageStatus.cs
rename to BuildingBlocks/PersistMessageProcessor/MessageStatus.cs
diff --git a/src/BuildingBlocks/PersistMessageProcessor/PersistMessage.cs b/BuildingBlocks/PersistMessageProcessor/PersistMessage.cs
similarity index 100%
rename from src/BuildingBlocks/PersistMessageProcessor/PersistMessage.cs
rename to BuildingBlocks/PersistMessageProcessor/PersistMessage.cs
diff --git a/src/BuildingBlocks/PersistMessageProcessor/PersistMessageBackgroundService.cs b/BuildingBlocks/PersistMessageProcessor/PersistMessageBackgroundService.cs
similarity index 100%
rename from src/BuildingBlocks/PersistMessageProcessor/PersistMessageBackgroundService.cs
rename to BuildingBlocks/PersistMessageProcessor/PersistMessageBackgroundService.cs
diff --git a/src/BuildingBlocks/PersistMessageProcessor/PersistMessageDbContext.cs b/BuildingBlocks/PersistMessageProcessor/PersistMessageDbContext.cs
similarity index 100%
rename from src/BuildingBlocks/PersistMessageProcessor/PersistMessageDbContext.cs
rename to BuildingBlocks/PersistMessageProcessor/PersistMessageDbContext.cs
diff --git a/src/BuildingBlocks/PersistMessageProcessor/PersistMessageOptions.cs b/BuildingBlocks/PersistMessageProcessor/PersistMessageOptions.cs
similarity index 100%
rename from src/BuildingBlocks/PersistMessageProcessor/PersistMessageOptions.cs
rename to BuildingBlocks/PersistMessageProcessor/PersistMessageOptions.cs
diff --git a/src/BuildingBlocks/PersistMessageProcessor/PersistMessageProcessor.cs b/BuildingBlocks/PersistMessageProcessor/PersistMessageProcessor.cs
similarity index 100%
rename from src/BuildingBlocks/PersistMessageProcessor/PersistMessageProcessor.cs
rename to BuildingBlocks/PersistMessageProcessor/PersistMessageProcessor.cs
diff --git a/src/BuildingBlocks/Polly/CircuitBreakerOptions.cs b/BuildingBlocks/Polly/CircuitBreakerOptions.cs
similarity index 100%
rename from src/BuildingBlocks/Polly/CircuitBreakerOptions.cs
rename to BuildingBlocks/Polly/CircuitBreakerOptions.cs
diff --git a/src/BuildingBlocks/Polly/Extensions.cs b/BuildingBlocks/Polly/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/Polly/Extensions.cs
rename to BuildingBlocks/Polly/Extensions.cs
diff --git a/src/BuildingBlocks/Polly/GrpcCircuitBreaker.cs b/BuildingBlocks/Polly/GrpcCircuitBreaker.cs
similarity index 100%
rename from src/BuildingBlocks/Polly/GrpcCircuitBreaker.cs
rename to BuildingBlocks/Polly/GrpcCircuitBreaker.cs
diff --git a/src/BuildingBlocks/Polly/GrpcRetry.cs b/BuildingBlocks/Polly/GrpcRetry.cs
similarity index 100%
rename from src/BuildingBlocks/Polly/GrpcRetry.cs
rename to BuildingBlocks/Polly/GrpcRetry.cs
diff --git a/src/BuildingBlocks/Polly/HttpClientCircuitBreaker.cs b/BuildingBlocks/Polly/HttpClientCircuitBreaker.cs
similarity index 100%
rename from src/BuildingBlocks/Polly/HttpClientCircuitBreaker.cs
rename to BuildingBlocks/Polly/HttpClientCircuitBreaker.cs
diff --git a/src/BuildingBlocks/Polly/HttpClientRetry.cs b/BuildingBlocks/Polly/HttpClientRetry.cs
similarity index 100%
rename from src/BuildingBlocks/Polly/HttpClientRetry.cs
rename to BuildingBlocks/Polly/HttpClientRetry.cs
diff --git a/src/BuildingBlocks/Polly/PolicyOptions.cs b/BuildingBlocks/Polly/PolicyOptions.cs
similarity index 100%
rename from src/BuildingBlocks/Polly/PolicyOptions.cs
rename to BuildingBlocks/Polly/PolicyOptions.cs
diff --git a/src/BuildingBlocks/Polly/RetryOptions.cs b/BuildingBlocks/Polly/RetryOptions.cs
similarity index 100%
rename from src/BuildingBlocks/Polly/RetryOptions.cs
rename to BuildingBlocks/Polly/RetryOptions.cs
diff --git a/src/BuildingBlocks/ProblemDetails/Extensions.cs b/BuildingBlocks/ProblemDetails/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/ProblemDetails/Extensions.cs
rename to BuildingBlocks/ProblemDetails/Extensions.cs
diff --git a/src/BuildingBlocks/TestBase/TestBase.cs b/BuildingBlocks/TestBase/TestBase.cs
similarity index 100%
rename from src/BuildingBlocks/TestBase/TestBase.cs
rename to BuildingBlocks/TestBase/TestBase.cs
diff --git a/src/BuildingBlocks/TestBase/TestContainers.cs b/BuildingBlocks/TestBase/TestContainers.cs
similarity index 100%
rename from src/BuildingBlocks/TestBase/TestContainers.cs
rename to BuildingBlocks/TestBase/TestContainers.cs
diff --git a/src/BuildingBlocks/Utils/NoSynchronizationContextScope.cs b/BuildingBlocks/Utils/NoSynchronizationContextScope.cs
similarity index 100%
rename from src/BuildingBlocks/Utils/NoSynchronizationContextScope.cs
rename to BuildingBlocks/Utils/NoSynchronizationContextScope.cs
diff --git a/src/BuildingBlocks/Utils/ServiceLocator.cs b/BuildingBlocks/Utils/ServiceLocator.cs
similarity index 100%
rename from src/BuildingBlocks/Utils/ServiceLocator.cs
rename to BuildingBlocks/Utils/ServiceLocator.cs
diff --git a/src/BuildingBlocks/Utils/TypeProvider.cs b/BuildingBlocks/Utils/TypeProvider.cs
similarity index 100%
rename from src/BuildingBlocks/Utils/TypeProvider.cs
rename to BuildingBlocks/Utils/TypeProvider.cs
diff --git a/src/BuildingBlocks/Validation/Extensions.cs b/BuildingBlocks/Validation/Extensions.cs
similarity index 100%
rename from src/BuildingBlocks/Validation/Extensions.cs
rename to BuildingBlocks/Validation/Extensions.cs
diff --git a/src/BuildingBlocks/Validation/ValidationBehavior.cs b/BuildingBlocks/Validation/ValidationBehavior.cs
similarity index 100%
rename from src/BuildingBlocks/Validation/ValidationBehavior.cs
rename to BuildingBlocks/Validation/ValidationBehavior.cs
diff --git a/src/BuildingBlocks/Validation/ValidationError.cs b/BuildingBlocks/Validation/ValidationError.cs
similarity index 100%
rename from src/BuildingBlocks/Validation/ValidationError.cs
rename to BuildingBlocks/Validation/ValidationError.cs
diff --git a/src/BuildingBlocks/Validation/ValidationResultModel.cs b/BuildingBlocks/Validation/ValidationResultModel.cs
similarity index 100%
rename from src/BuildingBlocks/Validation/ValidationResultModel.cs
rename to BuildingBlocks/Validation/ValidationResultModel.cs
diff --git a/src/BuildingBlocks/Web/ApiVersioningExtensions.cs b/BuildingBlocks/Web/ApiVersioningExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/Web/ApiVersioningExtensions.cs
rename to BuildingBlocks/Web/ApiVersioningExtensions.cs
diff --git a/src/BuildingBlocks/Web/AppOptions.cs b/BuildingBlocks/Web/AppOptions.cs
similarity index 100%
rename from src/BuildingBlocks/Web/AppOptions.cs
rename to BuildingBlocks/Web/AppOptions.cs
diff --git a/src/BuildingBlocks/Web/BaseController.cs b/BuildingBlocks/Web/BaseController.cs
similarity index 100%
rename from src/BuildingBlocks/Web/BaseController.cs
rename to BuildingBlocks/Web/BaseController.cs
diff --git a/src/BuildingBlocks/Web/ConfigurationExtensions.cs b/BuildingBlocks/Web/ConfigurationExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/Web/ConfigurationExtensions.cs
rename to BuildingBlocks/Web/ConfigurationExtensions.cs
diff --git a/src/BuildingBlocks/Web/ConfigurationHelper.cs b/BuildingBlocks/Web/ConfigurationHelper.cs
similarity index 100%
rename from src/BuildingBlocks/Web/ConfigurationHelper.cs
rename to BuildingBlocks/Web/ConfigurationHelper.cs
diff --git a/src/BuildingBlocks/Web/CorrelationExtensions.cs b/BuildingBlocks/Web/CorrelationExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/Web/CorrelationExtensions.cs
rename to BuildingBlocks/Web/CorrelationExtensions.cs
diff --git a/src/BuildingBlocks/Web/CurrentUserProvider.cs b/BuildingBlocks/Web/CurrentUserProvider.cs
similarity index 100%
rename from src/BuildingBlocks/Web/CurrentUserProvider.cs
rename to BuildingBlocks/Web/CurrentUserProvider.cs
diff --git a/src/BuildingBlocks/Web/EndpointConfig.cs b/BuildingBlocks/Web/EndpointConfig.cs
similarity index 100%
rename from src/BuildingBlocks/Web/EndpointConfig.cs
rename to BuildingBlocks/Web/EndpointConfig.cs
diff --git a/src/BuildingBlocks/Web/IMinimalEndpoint.cs b/BuildingBlocks/Web/IMinimalEndpoint.cs
similarity index 100%
rename from src/BuildingBlocks/Web/IMinimalEndpoint.cs
rename to BuildingBlocks/Web/IMinimalEndpoint.cs
diff --git a/src/BuildingBlocks/Web/MinimalApiExtensions.cs b/BuildingBlocks/Web/MinimalApiExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/Web/MinimalApiExtensions.cs
rename to BuildingBlocks/Web/MinimalApiExtensions.cs
diff --git a/src/BuildingBlocks/Web/ServiceCollectionExtensions.cs b/BuildingBlocks/Web/ServiceCollectionExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/Web/ServiceCollectionExtensions.cs
rename to BuildingBlocks/Web/ServiceCollectionExtensions.cs
diff --git a/src/BuildingBlocks/Web/ServiceProviderExtensions.cs b/BuildingBlocks/Web/ServiceProviderExtensions.cs
similarity index 100%
rename from src/BuildingBlocks/Web/ServiceProviderExtensions.cs
rename to BuildingBlocks/Web/ServiceProviderExtensions.cs
diff --git a/src/BuildingBlocks/Web/SlugifyParameterTransformer.cs b/BuildingBlocks/Web/SlugifyParameterTransformer.cs
similarity index 100%
rename from src/BuildingBlocks/Web/SlugifyParameterTransformer.cs
rename to BuildingBlocks/Web/SlugifyParameterTransformer.cs
diff --git a/booking-microservices-sample.sln b/booking-microservices-sample.sln
deleted file mode 100644
index c11e7aa..0000000
--- a/booking-microservices-sample.sln
+++ /dev/null
@@ -1,175 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildingBlocks", "BuildingBlocks", "{5B69EDFD-4B09-457A-AAAF-D816D402D595}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{9010E0B5-9C42-4256-ADE4-E290434F2CEF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiGateway", "ApiGateway", "{3E38DD17-9EEE-4815-9D5B-BEB5549020A0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{776BDF43-0DEA-44A3-AF72-99408CE544EE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiGateway", "src\ApiGateway\src\ApiGateway.csproj", "{A2D7C5C4-5148-4C3E-BB12-B7A197A290F5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlocks", "src\BuildingBlocks\BuildingBlocks.csproj", "{E42BB533-4144-4D78-BCCE-50BA00BCADBE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Flight", "Flight", "{5F0996AB-F8DB-4240-BD4A-DFDD70638A73}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Passenger", "Passenger", "{1A2ABCD9-493B-4848-9C69-919CDBCA61F3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Booking", "Booking", "{22447274-717D-4321-87F3-868BAF93CBEC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{55BE6759-95AA-434D-925D-A8D32F274E66}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E2637D6D-04A5-4DE4-8AAF-E015C65DE8E1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5185D5C5-0EAD-49D5-B405-93B939F3639B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{53D0AA09-F5FA-4721-8C1B-375CBD15B4E8}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C6EE337B-91EA-472A-87C7-E9528408CE59}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F39D8F09-6233-4495-ACD0-F98904993B7E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{295284BA-D4E4-40AA-A2C2-BE36343F7DE6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{85DA00E5-CC11-463C-8577-C34967C328F7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C1EBE17D-BFAD-47DA-88EB-BB073B84593E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Booking", "src\Services\Booking\src\Booking\Booking.csproj", "{B2BAA061-C005-409F-9D3E-BDCBE5B1B136}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Booking.Api", "src\Services\Booking\src\Booking.Api\Booking.Api.csproj", "{4E8FB852-4317-43D2-8EFC-14E3ECCFDA2C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flight", "src\Services\Flight\src\Flight\Flight.csproj", "{574222F8-9C26-4015-8F35-C1E5D41A505F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flight.Api", "src\Services\Flight\src\Flight.Api\Flight.Api.csproj", "{B8F734F5-873C-4367-9EBD-38EA420CD868}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Identity", "src\Services\Identity\src\Identity\Identity.csproj", "{65C1BB58-2A2E-44FF-B15D-2B023CF088D4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Identity.Api", "src\Services\Identity\src\Identity.Api\Identity.Api.csproj", "{BEE7A9D7-1BFC-477E-B070-4BE63C0361AA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Passenger", "src\Services\Passenger\src\Passenger\Passenger.csproj", "{6D7BCECE-D77D-4C57-A296-CA6E728E94B7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Passenger.Api", "src\Services\Passenger\src\Passenger.Api\Passenger.Api.csproj", "{4F29C4B6-A7DA-4A92-9CDB-42FE98238837}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration.Test", "src\Services\Flight\tests\IntegrationTest\Integration.Test.csproj", "{6B6603C8-D8B6-4775-9C7A-FFE6058070C2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration.Test", "src\Services\Identity\tests\IntegrationTest\Integration.Test.csproj", "{BC7871B8-BB18-4BCC-96A8-7324C11BF4A2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration.Test", "src\Services\Passenger\tests\IntegrationTest\Integration.Test.csproj", "{539364C8-88B1-48A3-8406-D0B19FF30509}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration.Test", "src\Services\Booking\tests\IntegrationTest\Integration.Test.csproj", "{50C66B53-ACA0-4AFF-8C5C-834D4EDA8FAC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unit.Test", "src\Services\Flight\tests\UnitTest\Unit.Test.csproj", "{8F78BCE2-C705-4357-A6B9-1B83B55ABBE8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEnd.Test", "src\Services\Flight\tests\EndToEndTest\EndToEnd.Test.csproj", "{8561089E-9FB9-4ACD-A1F5-EAAF213E1DDB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{776BDF43-0DEA-44A3-AF72-99408CE544EE} = {3E38DD17-9EEE-4815-9D5B-BEB5549020A0}
-		{A2D7C5C4-5148-4C3E-BB12-B7A197A290F5} = {776BDF43-0DEA-44A3-AF72-99408CE544EE}
-		{E42BB533-4144-4D78-BCCE-50BA00BCADBE} = {5B69EDFD-4B09-457A-AAAF-D816D402D595}
-		{5F0996AB-F8DB-4240-BD4A-DFDD70638A73} = {9010E0B5-9C42-4256-ADE4-E290434F2CEF}
-		{1A2ABCD9-493B-4848-9C69-919CDBCA61F3} = {9010E0B5-9C42-4256-ADE4-E290434F2CEF}
-		{22447274-717D-4321-87F3-868BAF93CBEC} = {9010E0B5-9C42-4256-ADE4-E290434F2CEF}
-		{55BE6759-95AA-434D-925D-A8D32F274E66} = {9010E0B5-9C42-4256-ADE4-E290434F2CEF}
-		{E2637D6D-04A5-4DE4-8AAF-E015C65DE8E1} = {22447274-717D-4321-87F3-868BAF93CBEC}
-		{5185D5C5-0EAD-49D5-B405-93B939F3639B} = {22447274-717D-4321-87F3-868BAF93CBEC}
-		{53D0AA09-F5FA-4721-8C1B-375CBD15B4E8} = {5F0996AB-F8DB-4240-BD4A-DFDD70638A73}
-		{C6EE337B-91EA-472A-87C7-E9528408CE59} = {5F0996AB-F8DB-4240-BD4A-DFDD70638A73}
-		{F39D8F09-6233-4495-ACD0-F98904993B7E} = {55BE6759-95AA-434D-925D-A8D32F274E66}
-		{295284BA-D4E4-40AA-A2C2-BE36343F7DE6} = {55BE6759-95AA-434D-925D-A8D32F274E66}
-		{85DA00E5-CC11-463C-8577-C34967C328F7} = {1A2ABCD9-493B-4848-9C69-919CDBCA61F3}
-		{C1EBE17D-BFAD-47DA-88EB-BB073B84593E} = {1A2ABCD9-493B-4848-9C69-919CDBCA61F3}
-		{B2BAA061-C005-409F-9D3E-BDCBE5B1B136} = {E2637D6D-04A5-4DE4-8AAF-E015C65DE8E1}
-		{4E8FB852-4317-43D2-8EFC-14E3ECCFDA2C} = {E2637D6D-04A5-4DE4-8AAF-E015C65DE8E1}
-		{574222F8-9C26-4015-8F35-C1E5D41A505F} = {53D0AA09-F5FA-4721-8C1B-375CBD15B4E8}
-		{B8F734F5-873C-4367-9EBD-38EA420CD868} = {53D0AA09-F5FA-4721-8C1B-375CBD15B4E8}
-		{65C1BB58-2A2E-44FF-B15D-2B023CF088D4} = {F39D8F09-6233-4495-ACD0-F98904993B7E}
-		{BEE7A9D7-1BFC-477E-B070-4BE63C0361AA} = {F39D8F09-6233-4495-ACD0-F98904993B7E}
-		{6D7BCECE-D77D-4C57-A296-CA6E728E94B7} = {85DA00E5-CC11-463C-8577-C34967C328F7}
-		{4F29C4B6-A7DA-4A92-9CDB-42FE98238837} = {85DA00E5-CC11-463C-8577-C34967C328F7}
-		{6B6603C8-D8B6-4775-9C7A-FFE6058070C2} = {C6EE337B-91EA-472A-87C7-E9528408CE59}
-		{BC7871B8-BB18-4BCC-96A8-7324C11BF4A2} = {295284BA-D4E4-40AA-A2C2-BE36343F7DE6}
-		{539364C8-88B1-48A3-8406-D0B19FF30509} = {C1EBE17D-BFAD-47DA-88EB-BB073B84593E}
-		{50C66B53-ACA0-4AFF-8C5C-834D4EDA8FAC} = {5185D5C5-0EAD-49D5-B405-93B939F3639B}
-		{8F78BCE2-C705-4357-A6B9-1B83B55ABBE8} = {C6EE337B-91EA-472A-87C7-E9528408CE59}
-		{8561089E-9FB9-4ACD-A1F5-EAAF213E1DDB} = {C6EE337B-91EA-472A-87C7-E9528408CE59}
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A2D7C5C4-5148-4C3E-BB12-B7A197A290F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2D7C5C4-5148-4C3E-BB12-B7A197A290F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2D7C5C4-5148-4C3E-BB12-B7A197A290F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2D7C5C4-5148-4C3E-BB12-B7A197A290F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E42BB533-4144-4D78-BCCE-50BA00BCADBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E42BB533-4144-4D78-BCCE-50BA00BCADBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E42BB533-4144-4D78-BCCE-50BA00BCADBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E42BB533-4144-4D78-BCCE-50BA00BCADBE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2BAA061-C005-409F-9D3E-BDCBE5B1B136}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2BAA061-C005-409F-9D3E-BDCBE5B1B136}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2BAA061-C005-409F-9D3E-BDCBE5B1B136}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2BAA061-C005-409F-9D3E-BDCBE5B1B136}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E8FB852-4317-43D2-8EFC-14E3ECCFDA2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E8FB852-4317-43D2-8EFC-14E3ECCFDA2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E8FB852-4317-43D2-8EFC-14E3ECCFDA2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E8FB852-4317-43D2-8EFC-14E3ECCFDA2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{574222F8-9C26-4015-8F35-C1E5D41A505F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{574222F8-9C26-4015-8F35-C1E5D41A505F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{574222F8-9C26-4015-8F35-C1E5D41A505F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{574222F8-9C26-4015-8F35-C1E5D41A505F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8F734F5-873C-4367-9EBD-38EA420CD868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8F734F5-873C-4367-9EBD-38EA420CD868}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8F734F5-873C-4367-9EBD-38EA420CD868}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8F734F5-873C-4367-9EBD-38EA420CD868}.Release|Any CPU.Build.0 = Release|Any CPU
-		{65C1BB58-2A2E-44FF-B15D-2B023CF088D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65C1BB58-2A2E-44FF-B15D-2B023CF088D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65C1BB58-2A2E-44FF-B15D-2B023CF088D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{65C1BB58-2A2E-44FF-B15D-2B023CF088D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEE7A9D7-1BFC-477E-B070-4BE63C0361AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEE7A9D7-1BFC-477E-B070-4BE63C0361AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEE7A9D7-1BFC-477E-B070-4BE63C0361AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEE7A9D7-1BFC-477E-B070-4BE63C0361AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D7BCECE-D77D-4C57-A296-CA6E728E94B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D7BCECE-D77D-4C57-A296-CA6E728E94B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D7BCECE-D77D-4C57-A296-CA6E728E94B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D7BCECE-D77D-4C57-A296-CA6E728E94B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F29C4B6-A7DA-4A92-9CDB-42FE98238837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F29C4B6-A7DA-4A92-9CDB-42FE98238837}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F29C4B6-A7DA-4A92-9CDB-42FE98238837}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F29C4B6-A7DA-4A92-9CDB-42FE98238837}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B6603C8-D8B6-4775-9C7A-FFE6058070C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B6603C8-D8B6-4775-9C7A-FFE6058070C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B6603C8-D8B6-4775-9C7A-FFE6058070C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B6603C8-D8B6-4775-9C7A-FFE6058070C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC7871B8-BB18-4BCC-96A8-7324C11BF4A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC7871B8-BB18-4BCC-96A8-7324C11BF4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC7871B8-BB18-4BCC-96A8-7324C11BF4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC7871B8-BB18-4BCC-96A8-7324C11BF4A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{539364C8-88B1-48A3-8406-D0B19FF30509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{539364C8-88B1-48A3-8406-D0B19FF30509}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{539364C8-88B1-48A3-8406-D0B19FF30509}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{539364C8-88B1-48A3-8406-D0B19FF30509}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50C66B53-ACA0-4AFF-8C5C-834D4EDA8FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50C66B53-ACA0-4AFF-8C5C-834D4EDA8FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50C66B53-ACA0-4AFF-8C5C-834D4EDA8FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50C66B53-ACA0-4AFF-8C5C-834D4EDA8FAC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F78BCE2-C705-4357-A6B9-1B83B55ABBE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F78BCE2-C705-4357-A6B9-1B83B55ABBE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F78BCE2-C705-4357-A6B9-1B83B55ABBE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F78BCE2-C705-4357-A6B9-1B83B55ABBE8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8561089E-9FB9-4ACD-A1F5-EAAF213E1DDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8561089E-9FB9-4ACD-A1F5-EAAF213E1DDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8561089E-9FB9-4ACD-A1F5-EAAF213E1DDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8561089E-9FB9-4ACD-A1F5-EAAF213E1DDB}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/deployments/tye/tye.yml b/deployments/tye/tye.yml
deleted file mode 100644
index 5cc89b7..0000000
--- a/deployments/tye/tye.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Booking
-services:
-  - name: booking-gateway
-    project: ./../../src/ApiGateway/src/ApiGateway.csproj
-    bindings:
-      - port: 5001
-    env:
-      - name: ASPNETCORE_ENVIRONMENT
-        value: development
-
-
-  - name: flight
-    project: ./../../src/Services/Flight/src/Flight.Api/Flight.Api.csproj
-    bindings:
-      - port: 5003
-    env:
-      - name: ASPNETCORE_ENVIRONMENT
-        value: development
-
-
-  - name: identity
-    project: ./../../src/Services/Identity/src/Identity.Api/Identity.Api.csproj
-    bindings:
-      - port: 5005
-    env:
-      - name: ASPNETCORE_ENVIRONMENT
-        value: development
-
-
-  - name: passenger
-    project: ./../../src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
-    bindings:
-      - port: 5012
-    env:
-      - name: ASPNETCORE_ENVIRONMENT
-        value: development
-
-
-  - name: booking
-    project: ./../../src/Services/Booking/src/Booking.Api/Booking.Api.csproj
-    bindings:
-      - port: 5010
-    env:
-      - name: ASPNETCORE_ENVIRONMENT
-        value: development
diff --git a/legacy-to-modern-architecture-styles.sln b/legacy-to-modern-architecture-styles.sln
new file mode 100644
index 0000000..682547c
--- /dev/null
+++ b/legacy-to-modern-architecture-styles.sln
@@ -0,0 +1,183 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildingBlocks", "BuildingBlocks", "{B85B39B5-B341-4117-8626-C5DD4F375569}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Monolith", "Monolith", "{96913068-5EFE-4D13-8B00-924AFED16439}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ModularMonolith", "ModularMonolith", "{F1BEC66C-B321-45D8-95C1-8DCD4743275D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microservices", "Microservices", "{33F5E6F6-FACB-4D34-8E48-B80E0497D239}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingBlocks", "BuildingBlocks\BuildingBlocks.csproj", "{BBB3F565-9EDF-45B7-B547-60AA4609E453}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{57366225-A26A-4715-A690-DA641B0C0450}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{39BAB0A0-3C16-49B1-B817-9EC5C600BF5E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{570274DD-E84A-4F22-9079-D60B59EC9ED2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AD2FB7C1-8641-47E9-B62D-B3A2D74147D8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DBAE70CC-011A-4997-9612-58AFAFF73291}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FB529C7A-F884-42D1-BE41-2A6B7CC4101B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Flight", "Flight", "{5A2A9F1C-245A-4978-93A0-E00120FEE765}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Booking", "Booking", "{D0A6E1E7-DFB6-4940-A254-F2E24897C4AC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Passenger", "Passenger", "{F77CA77C-49CE-49B5-BE5A-FCCF6C63D65A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{A1786514-35EB-4AFA-87E1-2FB89D748C02}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiGateway", "ApiGateway", "{A5E49049-0DFF-4D87-9188-2B0ACBC0D59B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiGateway", "3-Microservices-Architecture-Style\src\ApiGateway\src\ApiGateway.csproj", "{6538BDF3-A741-46E9-8988-C859ABB2FBB2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Booking.Api", "3-Microservices-Architecture-Style\src\Services\Booking\src\Booking.Api\Booking.Api.csproj", "{B851799B-A328-4E40-9095-C56C11A6235E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Booking", "3-Microservices-Architecture-Style\src\Services\Booking\src\Booking\Booking.csproj", "{674C0974-11C4-4BF7-B2DF-8ED753919224}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flight.Api", "3-Microservices-Architecture-Style\src\Services\Flight\src\Flight.Api\Flight.Api.csproj", "{FB8AA20B-0D31-4241-A126-07992BCF7E2A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flight", "3-Microservices-Architecture-Style\src\Services\Flight\src\Flight\Flight.csproj", "{0EB6B262-197D-450C-A56E-634D2D428FCB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Identity.Api", "3-Microservices-Architecture-Style\src\Services\Identity\src\Identity.Api\Identity.Api.csproj", "{694E763C-E076-4F36-A3CE-3A55D794C871}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Identity", "3-Microservices-Architecture-Style\src\Services\Identity\src\Identity\Identity.csproj", "{E18BC5D2-5A32-469A-9E0B-5ACFE3B6639B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Passenger.Api", "3-Microservices-Architecture-Style\src\Services\Passenger\src\Passenger.Api\Passenger.Api.csproj", "{1F2CE508-42D0-437B-83AB-0D5FEBE324F8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Passenger", "3-Microservices-Architecture-Style\src\Services\Passenger\src\Passenger\Passenger.csproj", "{77410EA7-739C-475B-B460-CCEF5CEE1AD1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Flight", "Flight", "{7D81CAA6-6DEF-43C1-AE1B-D0F0B7B09CE7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Passenger", "Passenger", "{D2F19D7F-A9DA-47D2-A445-F9ED8D4479C1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Booking", "Booking", "{51EE0C7A-6D1A-4538-957A-34B6906FC932}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{3FD37B50-3C7D-49E9-9456-A3E82675227D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration.Test", "3-Microservices-Architecture-Style\src\Services\Booking\tests\IntegrationTest\Integration.Test.csproj", "{5D3D2499-0732-4545-87F5-C26AF1FE827B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEnd.Test", "3-Microservices-Architecture-Style\src\Services\Flight\tests\EndToEndTest\EndToEnd.Test.csproj", "{EE5ECF6A-0D4F-4737-BAD3-AE66D1B53D83}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration.Test", "3-Microservices-Architecture-Style\src\Services\Flight\tests\IntegrationTest\Integration.Test.csproj", "{0A74D3F2-7814-4FB4-890D-4899749B67A2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unit.Test", "3-Microservices-Architecture-Style\src\Services\Flight\tests\UnitTest\Unit.Test.csproj", "{FDA41108-8194-49B2-8F78-9F8AECABB7BC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration.Test", "3-Microservices-Architecture-Style\src\Services\Identity\tests\IntegrationTest\Integration.Test.csproj", "{B6D11E8B-CAAE-4452-B3AE-A49DA7E68FE0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration.Test", "3-Microservices-Architecture-Style\src\Services\Passenger\tests\IntegrationTest\Integration.Test.csproj", "{6D17EFCC-63DB-4E51-8073-25D5E59B2170}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{BBB3F565-9EDF-45B7-B547-60AA4609E453} = {B85B39B5-B341-4117-8626-C5DD4F375569}
+		{57366225-A26A-4715-A690-DA641B0C0450} = {33F5E6F6-FACB-4D34-8E48-B80E0497D239}
+		{39BAB0A0-3C16-49B1-B817-9EC5C600BF5E} = {33F5E6F6-FACB-4D34-8E48-B80E0497D239}
+		{570274DD-E84A-4F22-9079-D60B59EC9ED2} = {F1BEC66C-B321-45D8-95C1-8DCD4743275D}
+		{AD2FB7C1-8641-47E9-B62D-B3A2D74147D8} = {F1BEC66C-B321-45D8-95C1-8DCD4743275D}
+		{DBAE70CC-011A-4997-9612-58AFAFF73291} = {96913068-5EFE-4D13-8B00-924AFED16439}
+		{FB529C7A-F884-42D1-BE41-2A6B7CC4101B} = {96913068-5EFE-4D13-8B00-924AFED16439}
+		{5A2A9F1C-245A-4978-93A0-E00120FEE765} = {57366225-A26A-4715-A690-DA641B0C0450}
+		{D0A6E1E7-DFB6-4940-A254-F2E24897C4AC} = {57366225-A26A-4715-A690-DA641B0C0450}
+		{F77CA77C-49CE-49B5-BE5A-FCCF6C63D65A} = {57366225-A26A-4715-A690-DA641B0C0450}
+		{A1786514-35EB-4AFA-87E1-2FB89D748C02} = {57366225-A26A-4715-A690-DA641B0C0450}
+		{A5E49049-0DFF-4D87-9188-2B0ACBC0D59B} = {57366225-A26A-4715-A690-DA641B0C0450}
+		{6538BDF3-A741-46E9-8988-C859ABB2FBB2} = {A5E49049-0DFF-4D87-9188-2B0ACBC0D59B}
+		{B851799B-A328-4E40-9095-C56C11A6235E} = {D0A6E1E7-DFB6-4940-A254-F2E24897C4AC}
+		{674C0974-11C4-4BF7-B2DF-8ED753919224} = {D0A6E1E7-DFB6-4940-A254-F2E24897C4AC}
+		{FB8AA20B-0D31-4241-A126-07992BCF7E2A} = {5A2A9F1C-245A-4978-93A0-E00120FEE765}
+		{0EB6B262-197D-450C-A56E-634D2D428FCB} = {5A2A9F1C-245A-4978-93A0-E00120FEE765}
+		{694E763C-E076-4F36-A3CE-3A55D794C871} = {A1786514-35EB-4AFA-87E1-2FB89D748C02}
+		{E18BC5D2-5A32-469A-9E0B-5ACFE3B6639B} = {A1786514-35EB-4AFA-87E1-2FB89D748C02}
+		{1F2CE508-42D0-437B-83AB-0D5FEBE324F8} = {F77CA77C-49CE-49B5-BE5A-FCCF6C63D65A}
+		{77410EA7-739C-475B-B460-CCEF5CEE1AD1} = {F77CA77C-49CE-49B5-BE5A-FCCF6C63D65A}
+		{7D81CAA6-6DEF-43C1-AE1B-D0F0B7B09CE7} = {39BAB0A0-3C16-49B1-B817-9EC5C600BF5E}
+		{D2F19D7F-A9DA-47D2-A445-F9ED8D4479C1} = {39BAB0A0-3C16-49B1-B817-9EC5C600BF5E}
+		{51EE0C7A-6D1A-4538-957A-34B6906FC932} = {39BAB0A0-3C16-49B1-B817-9EC5C600BF5E}
+		{3FD37B50-3C7D-49E9-9456-A3E82675227D} = {39BAB0A0-3C16-49B1-B817-9EC5C600BF5E}
+		{5D3D2499-0732-4545-87F5-C26AF1FE827B} = {51EE0C7A-6D1A-4538-957A-34B6906FC932}
+		{EE5ECF6A-0D4F-4737-BAD3-AE66D1B53D83} = {7D81CAA6-6DEF-43C1-AE1B-D0F0B7B09CE7}
+		{0A74D3F2-7814-4FB4-890D-4899749B67A2} = {7D81CAA6-6DEF-43C1-AE1B-D0F0B7B09CE7}
+		{FDA41108-8194-49B2-8F78-9F8AECABB7BC} = {7D81CAA6-6DEF-43C1-AE1B-D0F0B7B09CE7}
+		{B6D11E8B-CAAE-4452-B3AE-A49DA7E68FE0} = {3FD37B50-3C7D-49E9-9456-A3E82675227D}
+		{6D17EFCC-63DB-4E51-8073-25D5E59B2170} = {D2F19D7F-A9DA-47D2-A445-F9ED8D4479C1}
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BBB3F565-9EDF-45B7-B547-60AA4609E453}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBB3F565-9EDF-45B7-B547-60AA4609E453}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBB3F565-9EDF-45B7-B547-60AA4609E453}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBB3F565-9EDF-45B7-B547-60AA4609E453}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6538BDF3-A741-46E9-8988-C859ABB2FBB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6538BDF3-A741-46E9-8988-C859ABB2FBB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6538BDF3-A741-46E9-8988-C859ABB2FBB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6538BDF3-A741-46E9-8988-C859ABB2FBB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B851799B-A328-4E40-9095-C56C11A6235E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B851799B-A328-4E40-9095-C56C11A6235E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B851799B-A328-4E40-9095-C56C11A6235E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B851799B-A328-4E40-9095-C56C11A6235E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{674C0974-11C4-4BF7-B2DF-8ED753919224}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{674C0974-11C4-4BF7-B2DF-8ED753919224}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{674C0974-11C4-4BF7-B2DF-8ED753919224}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{674C0974-11C4-4BF7-B2DF-8ED753919224}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB8AA20B-0D31-4241-A126-07992BCF7E2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB8AA20B-0D31-4241-A126-07992BCF7E2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB8AA20B-0D31-4241-A126-07992BCF7E2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB8AA20B-0D31-4241-A126-07992BCF7E2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EB6B262-197D-450C-A56E-634D2D428FCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EB6B262-197D-450C-A56E-634D2D428FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EB6B262-197D-450C-A56E-634D2D428FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EB6B262-197D-450C-A56E-634D2D428FCB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{694E763C-E076-4F36-A3CE-3A55D794C871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{694E763C-E076-4F36-A3CE-3A55D794C871}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{694E763C-E076-4F36-A3CE-3A55D794C871}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{694E763C-E076-4F36-A3CE-3A55D794C871}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E18BC5D2-5A32-469A-9E0B-5ACFE3B6639B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E18BC5D2-5A32-469A-9E0B-5ACFE3B6639B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E18BC5D2-5A32-469A-9E0B-5ACFE3B6639B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E18BC5D2-5A32-469A-9E0B-5ACFE3B6639B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F2CE508-42D0-437B-83AB-0D5FEBE324F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F2CE508-42D0-437B-83AB-0D5FEBE324F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F2CE508-42D0-437B-83AB-0D5FEBE324F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F2CE508-42D0-437B-83AB-0D5FEBE324F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77410EA7-739C-475B-B460-CCEF5CEE1AD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77410EA7-739C-475B-B460-CCEF5CEE1AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77410EA7-739C-475B-B460-CCEF5CEE1AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77410EA7-739C-475B-B460-CCEF5CEE1AD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D3D2499-0732-4545-87F5-C26AF1FE827B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D3D2499-0732-4545-87F5-C26AF1FE827B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D3D2499-0732-4545-87F5-C26AF1FE827B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D3D2499-0732-4545-87F5-C26AF1FE827B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE5ECF6A-0D4F-4737-BAD3-AE66D1B53D83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE5ECF6A-0D4F-4737-BAD3-AE66D1B53D83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE5ECF6A-0D4F-4737-BAD3-AE66D1B53D83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE5ECF6A-0D4F-4737-BAD3-AE66D1B53D83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A74D3F2-7814-4FB4-890D-4899749B67A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A74D3F2-7814-4FB4-890D-4899749B67A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A74D3F2-7814-4FB4-890D-4899749B67A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A74D3F2-7814-4FB4-890D-4899749B67A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDA41108-8194-49B2-8F78-9F8AECABB7BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDA41108-8194-49B2-8F78-9F8AECABB7BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDA41108-8194-49B2-8F78-9F8AECABB7BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDA41108-8194-49B2-8F78-9F8AECABB7BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6D11E8B-CAAE-4452-B3AE-A49DA7E68FE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6D11E8B-CAAE-4452-B3AE-A49DA7E68FE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6D11E8B-CAAE-4452-B3AE-A49DA7E68FE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6D11E8B-CAAE-4452-B3AE-A49DA7E68FE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D17EFCC-63DB-4E51-8073-25D5E59B2170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D17EFCC-63DB-4E51-8073-25D5E59B2170}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D17EFCC-63DB-4E51-8073-25D5E59B2170}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D17EFCC-63DB-4E51-8073-25D5E59B2170}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/package.json b/package.json
index 7ca936f..fe31db6 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
 {
-  "name": "booking-microservices",
+  "name": "legacy-to-modern-architecture-styles",
   "version": "1.0.0",
-  "description": "booking-microservices",
+  "description": "legacy-to-modern-architecture-styles",
   "author": "Meysam Hadeli",
   "license": "MIT",
   "main": "index.js",
   "scripts": {
     "prepare": "husky && dotnet tool restore",
-    "format": "dotnet format booking-microservices-sample.sln --severity error --verbosity detailed",
-    "ci-format": "dotnet format booking-microservices-sample.sln --verify-no-changes --severity error --verbosity detailed",
+    "format": "dotnet format legacy-to-modern-architecture-styles.sln --severity error --verbosity detailed",
+    "ci-format": "dotnet format legacy-to-modern-architecture-styles.sln --verify-no-changes --severity error --verbosity detailed",
     "upgrade-packages": "dotnet outdated --upgrade"
   },
   "devDependencies": {
diff --git a/src/ApiGateway/Dockerfile b/src/ApiGateway/Dockerfile
deleted file mode 100644
index 74ebf6d..0000000
--- a/src/ApiGateway/Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
-WORKDIR /
-
-COPY ./.editorconfig ./
-COPY ./global.json ./
-COPY ./Directory.Build.props ./
-
-# Setup working directory for the project
-COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
-COPY ./src/ApiGateway/src/ApiGateway.csproj ./ApiGateway/src/
-
-
-# Restore nuget packages
-RUN dotnet restore ./ApiGateway/src/ApiGateway.csproj
-
-# Copy project files
-COPY ./src/BuildingBlocks ./BuildingBlocks/
-COPY ./src/ApiGateway/src  ./ApiGateway/src/
-
-# Build project with Release configuration
-# and no restore, as we did it already
-
-RUN ls
-RUN dotnet build  -c Release --no-restore ./ApiGateway/src/ApiGateway.csproj
-
-WORKDIR /ApiGateway/src
-
-# Publish project to output folder
-# and no build, as we did it already
-RUN dotnet publish -c Release --no-build -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
-
-# Setup working directory for the project
-WORKDIR /
-COPY --from=builder /src/ApiGateway/src/out  .
-
-ENV ASPNETCORE_URLS https://*:443, http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-
-EXPOSE 80
-EXPOSE 443
-
-ENTRYPOINT ["dotnet", "ApiGateway.dll"]
-
diff --git a/src/ApiGateway/src/ApiGateway.csproj b/src/ApiGateway/src/ApiGateway.csproj
deleted file mode 100644
index d6fbb2b..0000000
--- a/src/ApiGateway/src/ApiGateway.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\BuildingBlocks\BuildingBlocks.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Services/Booking/Dockerfile b/src/Services/Booking/Dockerfile
deleted file mode 100644
index 15b7f4a..0000000
--- a/src/Services/Booking/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
-WORKDIR /
-
-COPY ./.editorconfig ./
-COPY ./global.json ./
-COPY ./Directory.Build.props ./
-
-# Setup working directory for the project
-COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
-COPY ./src/Services/Booking/src/Booking/Booking.csproj ./Services/Booking/src/Booking/
-COPY ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj ./Services/Booking/src/Booking.Api/
-
-
-# Restore nuget packages
-RUN  dotnet restore ./Services/Booking/src/Booking.Api/Booking.Api.csproj
-
-# Copy project files
-COPY ./src/BuildingBlocks ./BuildingBlocks/
-COPY ./src/Services/Booking/src/Booking/  ./Services/Booking/src/Booking/
-COPY ./src/Services/Booking/src/Booking.Api/  ./Services/Booking/src/Booking.Api/
-
-# Build project with Release configuration
-# and no restore, as we did it already
-
-RUN ls
-RUN  dotnet build  -c Release --no-restore ./Services/Booking/src/Booking.Api/Booking.Api.csproj
-
-WORKDIR /Services/Booking/src/Booking.Api
-
-# Publish project to output folder
-# and no build, as we did it already
-RUN dotnet publish -c Release --no-build -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
-
-# Setup working directory for the project
-WORKDIR /
-COPY --from=builder /Services/Booking/src/Booking.Api/out  .
-
-ENV ASPNETCORE_URLS https://*:443, http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-
-EXPOSE 80
-EXPOSE 443
-
-ENTRYPOINT ["dotnet", "Booking.Api.dll"]
-
diff --git a/src/Services/Booking/dev.Dockerfile b/src/Services/Booking/dev.Dockerfile
deleted file mode 100644
index 6fb5f85..0000000
--- a/src/Services/Booking/dev.Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
-WORKDIR /
-
-COPY ./.editorconfig ./
-COPY ./global.json ./
-COPY ./Directory.Build.props ./
-
-# Setup working directory for the project
-COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
-COPY ./src/Services/Booking/src/Booking/Booking.csproj ./Services/Booking/src/Booking/
-COPY ./src/Services/Booking/src/Booking.Api/Booking.Api.csproj ./Services/Booking/src/Booking.Api/
-
-
-# Restore nuget packages
-RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages \
-    dotnet restore ./Services/Booking/src/Booking.Api/Booking.Api.csproj
-
-# Copy project files
-COPY ./src/BuildingBlocks ./BuildingBlocks/
-COPY ./src/Services/Booking/src/Booking/  ./Services/Booking/src/Booking/
-COPY ./src/Services/Booking/src/Booking.Api/  ./Services/Booking/src/Booking.Api/
-
-# Build project with Release configuration
-# and no restore, as we did it already
-
-RUN ls
-RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages\
-    dotnet build  -c Release --no-restore ./Services/Booking/src/Booking.Api/Booking.Api.csproj
-
-WORKDIR /Services/Booking/src/Booking.Api
-
-# Publish project to output folder
-# and no build, as we did it already
-RUN --mount=type=cache,id=booking_nuget,target=/root/.nuget/packages\
-    dotnet publish -c Release --no-build -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
-
-# Setup working directory for the project
-WORKDIR /
-COPY --from=builder /Services/Booking/src/Booking.Api/out  .
-
-ENV ASPNETCORE_URLS https://*:443, http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-
-EXPOSE 80
-EXPOSE 443
-
-ENTRYPOINT ["dotnet", "Booking.Api.dll"]
-
diff --git a/src/Services/Flight/Dockerfile b/src/Services/Flight/Dockerfile
deleted file mode 100644
index 9581cb8..0000000
--- a/src/Services/Flight/Dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
-WORKDIR /
-
-COPY ./.editorconfig ./
-COPY ./global.json ./
-COPY ./Directory.Build.props ./
-
-# Setup working directory for the project
-COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
-COPY ./src/Services/Flight/src/Flight/Flight.csproj ./Services/Flight/src/Flight/
-COPY ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj ./Services/Flight/src/Flight.Api/
-
-
-# Restore nuget packages
-RUN dotnet restore ./Services/Flight/src/Flight.Api/Flight.Api.csproj
-
-# Copy project files
-COPY ./src/BuildingBlocks ./BuildingBlocks/
-COPY ./src/Services/Flight/src/Flight/  ./Services/Flight/src/Flight/
-COPY ./src/Services/Flight/src/Flight.Api/  ./Services/Flight/src/Flight.Api/
-
-# Build project with Release configuration
-# and no restore, as we did it already
-
-RUN ls
-RUN dotnet build  -c Release --no-restore ./Services/Flight/src/Flight.Api/Flight.Api.csproj
-
-WORKDIR /Services/Flight/src/Flight.Api
-
-# Publish project to output folder
-# and no build, as we did it already
-RUN dotnet publish -c Release --no-build -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
-
-# Setup working directory for the project
-WORKDIR /
-COPY --from=builder /Services/Flight/src/Flight.Api/out  .
-
-
-ENV ASPNETCORE_URLS https://*:443, http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-
-EXPOSE 80
-EXPOSE 443
-
-ENTRYPOINT ["dotnet", "Flight.Api.dll"]
-
diff --git a/src/Services/Flight/dev.Dockerfile b/src/Services/Flight/dev.Dockerfile
deleted file mode 100644
index ddfcd04..0000000
--- a/src/Services/Flight/dev.Dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
-WORKDIR /
-
-COPY ./.editorconfig ./
-COPY ./global.json ./
-COPY ./Directory.Build.props ./
-
-# Setup working directory for the project
-COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
-COPY ./src/Services/Flight/src/Flight/Flight.csproj ./Services/Flight/src/Flight/
-COPY ./src/Services/Flight/src/Flight.Api/Flight.Api.csproj ./Services/Flight/src/Flight.Api/
-
-
-# Restore nuget packages
-RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
-    dotnet restore ./Services/Flight/src/Flight.Api/Flight.Api.csproj
-
-# Copy project files
-COPY ./src/BuildingBlocks ./BuildingBlocks/
-COPY ./src/Services/Flight/src/Flight/  ./Services/Flight/src/Flight/
-COPY ./src/Services/Flight/src/Flight.Api/  ./Services/Flight/src/Flight.Api/
-
-# Build project with Release configuration
-# and no restore, as we did it already
-
-RUN ls
-RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
-    dotnet build  -c Release --no-restore ./Services/Flight/src/Flight.Api/Flight.Api.csproj
-
-WORKDIR /Services/Flight/src/Flight.Api
-
-# Publish project to output folder
-# and no build, as we did it already
-RUN --mount=type=cache,id=flight_nuget,target=/root/.nuget/packages \
-    dotnet publish -c Release --no-build -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
-
-# Setup working directory for the project
-WORKDIR /
-COPY --from=builder /Services/Flight/src/Flight.Api/out  .
-
-
-ENV ASPNETCORE_URLS https://*:443, http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-
-EXPOSE 80
-EXPOSE 443
-
-ENTRYPOINT ["dotnet", "Flight.Api.dll"]
-
diff --git a/src/Services/Identity/Dockerfile b/src/Services/Identity/Dockerfile
deleted file mode 100644
index df27909..0000000
--- a/src/Services/Identity/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
-
-# Setup working directory for the project
-WORKDIR /
-
-COPY ./.editorconfig ./
-COPY ./global.json ./
-COPY ./Directory.Build.props ./
-
-COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
-COPY ./src/Services/Identity/src/Identity/Identity.csproj ./Services/Identity/src/Identity/
-COPY ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj ./Services/Identity/src/Identity.Api/
-
-# Restore nuget packages
-RUN dotnet restore ./Services/Identity/src/Identity.Api/Identity.Api.csproj
-
-# Copy project files
-COPY ./src/BuildingBlocks ./BuildingBlocks/
-COPY ./src/Services/Identity/src/Identity/  ./Services/Identity/src/Identity/
-COPY ./src/Services/Identity/src/Identity.Api/  ./Services/Identity/src/Identity.Api/
-
-# Build project with Release configuration
-# and no restore, as we did it already
-
-RUN ls
-RUN dotnet build  -c Release --no-restore ./Services/Identity/src/Identity.Api/Identity.Api.csproj
-
-WORKDIR /Services/Identity/src/Identity.Api
-
-# Publish project to output folder
-# and no build, as we did it already
-RUN dotnet publish -c Release --no-build -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
-
-# Setup working directory for the project
-WORKDIR /
-COPY --from=builder /Services/Identity/src/Identity.Api/out  .
-
-ENV ASPNETCORE_URLS https://*:443, http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-
-EXPOSE 80
-EXPOSE 443
-
-ENTRYPOINT ["dotnet", "Identity.Api.dll"]
-
diff --git a/src/Services/Identity/dev.Dockerfile b/src/Services/Identity/dev.Dockerfile
deleted file mode 100644
index dbcde4f..0000000
--- a/src/Services/Identity/dev.Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
-
-# Setup working directory for the project
-WORKDIR /
-
-COPY ./.editorconfig ./
-COPY ./global.json ./
-COPY ./Directory.Build.props ./
-
-COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
-COPY ./src/Services/Identity/src/Identity/Identity.csproj ./Services/Identity/src/Identity/
-COPY ./src/Services/Identity/src/Identity.Api/Identity.Api.csproj ./Services/Identity/src/Identity.Api/
-
-# Restore nuget packages
-RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
-    dotnet restore ./Services/Identity/src/Identity.Api/Identity.Api.csproj
-
-# Copy project files
-COPY ./src/BuildingBlocks ./BuildingBlocks/
-COPY ./src/Services/Identity/src/Identity/  ./Services/Identity/src/Identity/
-COPY ./src/Services/Identity/src/Identity.Api/  ./Services/Identity/src/Identity.Api/
-
-# Build project with Release configuration
-# and no restore, as we did it already
-
-RUN ls
-RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
-    dotnet build  -c Release --no-restore ./Services/Identity/src/Identity.Api/Identity.Api.csproj
-
-WORKDIR /Services/Identity/src/Identity.Api
-
-# Publish project to output folder
-# and no build, as we did it already
-RUN --mount=type=cache,id=identity_nuget,target=/root/.nuget/packages \
-   dotnet publish -c Release --no-build -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
-
-# Setup working directory for the project
-WORKDIR /
-COPY --from=builder /Services/Identity/src/Identity.Api/out  .
-
-ENV ASPNETCORE_URLS https://*:443, http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-
-EXPOSE 80
-EXPOSE 443
-
-ENTRYPOINT ["dotnet", "Identity.Api.dll"]
-
diff --git a/src/Services/Passenger/Dockerfile b/src/Services/Passenger/Dockerfile
deleted file mode 100644
index 922bda4..0000000
--- a/src/Services/Passenger/Dockerfile
+++ /dev/null
@@ -1,47 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
-WORKDIR /
-
-COPY ./.editorconfig ./
-COPY ./global.json ./
-COPY ./Directory.Build.props ./
-
-# Setup working directory for the project
-COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
-COPY ./src/Services/Passenger/src/Passenger/Passenger.csproj ./Services/Passenger/src/Passenger/
-COPY ./src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj ./Services/Passenger/src/Passenger.Api/
-
-
-# Restore nuget packages
-RUN dotnet restore ./Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
-
-# Copy project files
-COPY ./src/BuildingBlocks ./BuildingBlocks/
-COPY ./src/Services/Passenger/src/Passenger/  ./Services/Passenger/src/Passenger/
-COPY ./src/Services/Passenger/src/Passenger.Api/  ./Services/Passenger/src/Passenger.Api/
-
-# Build project with Release configuration
-# and no restore, as we did it already
-
-RUN ls
-RUN dotnet build  -c Release --no-restore ./Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
-
-WORKDIR /Services/Passenger/src/Passenger.Api
-
-# Publish project to output folder
-# and no build, as we did it already
-RUN dotnet publish -c Release --no-build -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
-
-# Setup working directory for the project
-WORKDIR /
-COPY --from=builder /Services/Passenger/src/Passenger.Api/out  .
-
-ENV ASPNETCORE_URLS https://*:443, http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-
-EXPOSE 80
-EXPOSE 443
-
-ENTRYPOINT ["dotnet", "Passenger.Api.dll"]
-
diff --git a/src/Services/Passenger/dev.Dockerfile b/src/Services/Passenger/dev.Dockerfile
deleted file mode 100644
index 9582ce5..0000000
--- a/src/Services/Passenger/dev.Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder
-WORKDIR /
-
-COPY ./.editorconfig ./
-COPY ./global.json ./
-COPY ./Directory.Build.props ./
-
-# Setup working directory for the project
-COPY ./src/BuildingBlocks/BuildingBlocks.csproj ./BuildingBlocks/
-COPY ./src/Services/Passenger/src/Passenger/Passenger.csproj ./Services/Passenger/src/Passenger/
-COPY ./src/Services/Passenger/src/Passenger.Api/Passenger.Api.csproj ./Services/Passenger/src/Passenger.Api/
-
-
-# Restore nuget packages
-RUN --mount=type=cache,id=passenger_nuget,target=/root/.nuget/packages \
-    dotnet restore ./Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
-
-# Copy project files
-COPY ./src/BuildingBlocks ./BuildingBlocks/
-COPY ./src/Services/Passenger/src/Passenger/  ./Services/Passenger/src/Passenger/
-COPY ./src/Services/Passenger/src/Passenger.Api/  ./Services/Passenger/src/Passenger.Api/
-
-# Build project with Release configuration
-# and no restore, as we did it already
-
-RUN ls
-RUN --mount=type=cache,id=passenger_nuget,target=/root/.nuget/packages \
-    dotnet build  -c Release --no-restore ./Services/Passenger/src/Passenger.Api/Passenger.Api.csproj
-
-WORKDIR /Services/Passenger/src/Passenger.Api
-
-# Publish project to output folder
-# and no build, as we did it already
-RUN --mount=type=cache,id=passenger_nuget,target=/root/.nuget/packages \
-    dotnet publish -c Release --no-build -o out
-
-FROM mcr.microsoft.com/dotnet/aspnet:9.0
-
-# Setup working directory for the project
-WORKDIR /
-COPY --from=builder /Services/Passenger/src/Passenger.Api/out  .
-
-ENV ASPNETCORE_URLS https://*:443, http://*:80
-ENV ASPNETCORE_ENVIRONMENT docker
-
-EXPOSE 80
-EXPOSE 443
-
-ENTRYPOINT ["dotnet", "Passenger.Api.dll"]
-