diff --git a/libaries/.gitignore b/libraries/.gitignore
similarity index 100%
rename from libaries/.gitignore
rename to libraries/.gitignore
diff --git a/libaries/AWS.Lambda.Powertools.sln b/libraries/AWS.Lambda.Powertools.sln
similarity index 100%
rename from libaries/AWS.Lambda.Powertools.sln
rename to libraries/AWS.Lambda.Powertools.sln
diff --git a/libaries/src/Amazon.LambdaPowertools.Logging/Amazon.LambdaPowertools.Logging.csproj b/libraries/src/Amazon.LambdaPowertools.Logging/Amazon.LambdaPowertools.Logging.csproj
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools.Logging/Amazon.LambdaPowertools.Logging.csproj
rename to libraries/src/Amazon.LambdaPowertools.Logging/Amazon.LambdaPowertools.Logging.csproj
diff --git a/libaries/src/Amazon.LambdaPowertools.Logging/Class1.cs b/libraries/src/Amazon.LambdaPowertools.Logging/Class1.cs
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools.Logging/Class1.cs
rename to libraries/src/Amazon.LambdaPowertools.Logging/Class1.cs
diff --git a/libaries/src/Amazon.LambdaPowertools.Metrics/Amazon.LambdaPowertools.Metrics.csproj b/libraries/src/Amazon.LambdaPowertools.Metrics/Amazon.LambdaPowertools.Metrics.csproj
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools.Metrics/Amazon.LambdaPowertools.Metrics.csproj
rename to libraries/src/Amazon.LambdaPowertools.Metrics/Amazon.LambdaPowertools.Metrics.csproj
diff --git a/libaries/src/Amazon.LambdaPowertools.Metrics/Class1.cs b/libraries/src/Amazon.LambdaPowertools.Metrics/Class1.cs
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools.Metrics/Class1.cs
rename to libraries/src/Amazon.LambdaPowertools.Metrics/Class1.cs
diff --git a/libaries/src/Amazon.LambdaPowertools.Tracing/Amazon.LambdaPowertools.Tracing.csproj b/libraries/src/Amazon.LambdaPowertools.Tracing/Amazon.LambdaPowertools.Tracing.csproj
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools.Tracing/Amazon.LambdaPowertools.Tracing.csproj
rename to libraries/src/Amazon.LambdaPowertools.Tracing/Amazon.LambdaPowertools.Tracing.csproj
diff --git a/libaries/src/Amazon.LambdaPowertools.Tracing/CaptureHandler.cs b/libraries/src/Amazon.LambdaPowertools.Tracing/CaptureHandler.cs
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools.Tracing/CaptureHandler.cs
rename to libraries/src/Amazon.LambdaPowertools.Tracing/CaptureHandler.cs
diff --git a/libaries/src/Amazon.LambdaPowertools.Tracing/CaptureMethod.cs b/libraries/src/Amazon.LambdaPowertools.Tracing/CaptureMethod.cs
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools.Tracing/CaptureMethod.cs
rename to libraries/src/Amazon.LambdaPowertools.Tracing/CaptureMethod.cs
diff --git a/libaries/src/Amazon.LambdaPowertools.Tracing/ITracer.cs b/libraries/src/Amazon.LambdaPowertools.Tracing/ITracer.cs
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools.Tracing/ITracer.cs
rename to libraries/src/Amazon.LambdaPowertools.Tracing/ITracer.cs
diff --git a/libaries/src/Amazon.LambdaPowertools.Tracing/ITracerOptions.cs b/libraries/src/Amazon.LambdaPowertools.Tracing/ITracerOptions.cs
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools.Tracing/ITracerOptions.cs
rename to libraries/src/Amazon.LambdaPowertools.Tracing/ITracerOptions.cs
diff --git a/libaries/src/Amazon.LambdaPowertools.Tracing/Tracer.cs b/libraries/src/Amazon.LambdaPowertools.Tracing/Tracer.cs
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools.Tracing/Tracer.cs
rename to libraries/src/Amazon.LambdaPowertools.Tracing/Tracer.cs
diff --git a/libaries/src/Amazon.LambdaPowertools/Amazon.LambdaPowertools.csproj b/libraries/src/Amazon.LambdaPowertools/Amazon.LambdaPowertools.csproj
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools/Amazon.LambdaPowertools.csproj
rename to libraries/src/Amazon.LambdaPowertools/Amazon.LambdaPowertools.csproj
diff --git a/libaries/src/Amazon.LambdaPowertools/Class1.cs b/libraries/src/Amazon.LambdaPowertools/Class1.cs
similarity index 100%
rename from libaries/src/Amazon.LambdaPowertools/Class1.cs
rename to libraries/src/Amazon.LambdaPowertools/Class1.cs
diff --git a/libaries/tests/Amazon.LambdaPowertools.Logging.Tests/Amazon.LambdaPowertools.Logging.Tests.csproj b/libraries/tests/Amazon.LambdaPowertools.Logging.Tests/Amazon.LambdaPowertools.Logging.Tests.csproj
similarity index 100%
rename from libaries/tests/Amazon.LambdaPowertools.Logging.Tests/Amazon.LambdaPowertools.Logging.Tests.csproj
rename to libraries/tests/Amazon.LambdaPowertools.Logging.Tests/Amazon.LambdaPowertools.Logging.Tests.csproj
diff --git a/libaries/tests/Amazon.LambdaPowertools.Logging.Tests/Class1.cs b/libraries/tests/Amazon.LambdaPowertools.Logging.Tests/Class1.cs
similarity index 100%
rename from libaries/tests/Amazon.LambdaPowertools.Logging.Tests/Class1.cs
rename to libraries/tests/Amazon.LambdaPowertools.Logging.Tests/Class1.cs
diff --git a/libaries/tests/Amazon.LambdaPowertools.Metrics.Tests/Amazon.LambdaPowertools.Metrics.Tests.csproj b/libraries/tests/Amazon.LambdaPowertools.Metrics.Tests/Amazon.LambdaPowertools.Metrics.Tests.csproj
similarity index 100%
rename from libaries/tests/Amazon.LambdaPowertools.Metrics.Tests/Amazon.LambdaPowertools.Metrics.Tests.csproj
rename to libraries/tests/Amazon.LambdaPowertools.Metrics.Tests/Amazon.LambdaPowertools.Metrics.Tests.csproj
diff --git a/libaries/tests/Amazon.LambdaPowertools.Metrics.Tests/Class1.cs b/libraries/tests/Amazon.LambdaPowertools.Metrics.Tests/Class1.cs
similarity index 100%
rename from libaries/tests/Amazon.LambdaPowertools.Metrics.Tests/Class1.cs
rename to libraries/tests/Amazon.LambdaPowertools.Metrics.Tests/Class1.cs
diff --git a/libaries/tests/Amazon.LambdaPowertools.Tracing.Tests/Amazon.LambdaPowertools.Tracing.Tests.csproj b/libraries/tests/Amazon.LambdaPowertools.Tracing.Tests/Amazon.LambdaPowertools.Tracing.Tests.csproj
similarity index 100%
rename from libaries/tests/Amazon.LambdaPowertools.Tracing.Tests/Amazon.LambdaPowertools.Tracing.Tests.csproj
rename to libraries/tests/Amazon.LambdaPowertools.Tracing.Tests/Amazon.LambdaPowertools.Tracing.Tests.csproj
diff --git a/libaries/tests/Amazon.LambdaPowertools.Tracing.Tests/TestFunction.cs b/libraries/tests/Amazon.LambdaPowertools.Tracing.Tests/TestFunction.cs
similarity index 88%
rename from libaries/tests/Amazon.LambdaPowertools.Tracing.Tests/TestFunction.cs
rename to libraries/tests/Amazon.LambdaPowertools.Tracing.Tests/TestFunction.cs
index 859ebd390..ef12a5f6b 100644
--- a/libaries/tests/Amazon.LambdaPowertools.Tracing.Tests/TestFunction.cs
+++ b/libraries/tests/Amazon.LambdaPowertools.Tracing.Tests/TestFunction.cs
@@ -15,19 +15,17 @@ public TestFunction()
             _tracer = new Tracer();
         }
         
-        
-        [Obsolete]
         [CaptureMethod(service: "MyService", disabled:false, autoPatch: false, patchmodules: null)]
         private string ConfirmBooking(string bookingId)
         {
             var response =  AddConfirmation(bookingId);
             
             _tracer.PutMetadata("BookingConfirmation", response["requestId"]);
-            _tracer.PutMetadata("Booking confirmation", JSON);
+            _tracer.PutMetadata("Booking confirmation", "{}");
             _tracer.PutMetadata("", "");
             
             
-            return response;
+            return response.ToString();
         }
 
         private Dictionary<string,string> AddConfirmation(string bookingId)