diff --git a/zero.Api/Models/ApiResponse.cs b/zero.Api/Models/ApiResponse.cs
new file mode 100644
index 00000000..e0017c39
--- /dev/null
+++ b/zero.Api/Models/ApiResponse.cs
@@ -0,0 +1,8 @@
+namespace zero.Api.Models
+{
+  public class ApiResponse
+  {
+    [JsonPropertyName("@metadata")]
+    public ApiResponseMetadata Metadata { get; set; } = new();
+  }
+}
diff --git a/zero.Api/Models/ApiResponseMetadata.cs b/zero.Api/Models/ApiResponseMetadata.cs
new file mode 100644
index 00000000..25c6cabf
--- /dev/null
+++ b/zero.Api/Models/ApiResponseMetadata.cs
@@ -0,0 +1,6 @@
+namespace zero.Api.Models;
+
+public class ApiResponseMetadata
+{
+  public DateTimeOffset RequestDate { get; set; }
+}
\ No newline at end of file
diff --git a/zero.Api/Models/TreeItem.cs b/zero.Api/Models/Trees/TreeItem.cs
similarity index 100%
rename from zero.Api/Models/TreeItem.cs
rename to zero.Api/Models/Trees/TreeItem.cs
diff --git a/zero.Api/Models/TreeItemModifier.cs b/zero.Api/Models/Trees/TreeItemModifier.cs
similarity index 100%
rename from zero.Api/Models/TreeItemModifier.cs
rename to zero.Api/Models/Trees/TreeItemModifier.cs
diff --git a/zero.Api/Models/BasicModel.cs b/zero.Api/Models/_new/BasicModel.cs
similarity index 100%
rename from zero.Api/Models/BasicModel.cs
rename to zero.Api/Models/_new/BasicModel.cs
diff --git a/zero.Api/Models/DisplayModel.cs b/zero.Api/Models/_new/DisplayModel.cs
similarity index 100%
rename from zero.Api/Models/DisplayModel.cs
rename to zero.Api/Models/_new/DisplayModel.cs
diff --git a/zero.Api/Models/PickerModel.cs b/zero.Api/Models/_new/PickerModel.cs
similarity index 100%
rename from zero.Api/Models/PickerModel.cs
rename to zero.Api/Models/_new/PickerModel.cs
diff --git a/zero.Api/Models/PickerPreviewModel.cs b/zero.Api/Models/_new/PickerPreviewModel.cs
similarity index 100%
rename from zero.Api/Models/PickerPreviewModel.cs
rename to zero.Api/Models/_new/PickerPreviewModel.cs
diff --git a/zero.Api/Models/SaveModel.cs b/zero.Api/Models/_new/SaveModel.cs
similarity index 100%
rename from zero.Api/Models/SaveModel.cs
rename to zero.Api/Models/_new/SaveModel.cs
diff --git a/zero.Api/Modules/Countries/CountriesController.cs b/zero.Api/Modules/Countries/CountriesController.cs
index f21943da..cb4ee4c0 100644
--- a/zero.Api/Modules/Countries/CountriesController.cs
+++ b/zero.Api/Modules/Countries/CountriesController.cs
@@ -21,6 +21,8 @@ public class CountriesController : ZeroApiController
   [ZeroAuthorize(CountryPermissions.Create)]
   public virtual async Task<ActionResult<DisplayModel>> Empty()
   {
+    throw new NotImplementedException("TEST ZERO");
+
     Country model = await Store.Empty();
 
     if (model == null)
diff --git a/zero.Api/Usings.cs b/zero.Api/Usings.cs
index 9c23550b..9e35c368 100644
--- a/zero.Api/Usings.cs
+++ b/zero.Api/Usings.cs
@@ -4,6 +4,7 @@ global using System.Collections.Generic;
 global using System.Linq;
 global using System.Threading;
 global using System.Threading.Tasks;
+global using System.Text.Json.Serialization;
 
 global using zero.Applications;
 global using zero.Architecture;
diff --git a/zero.Api/zero.Api.csproj b/zero.Api/zero.Api.csproj
index 5bec65ef..1254f8b7 100644
--- a/zero.Api/zero.Api.csproj
+++ b/zero.Api/zero.Api.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PackageId>zero.Api</PackageId>