diff --git a/src/server/CookingApp/Models/Allergy.cs b/src/server/CookingApp/Models/Allergy.cs
index 374ce612..762a93a0 100644
--- a/src/server/CookingApp/Models/Allergy.cs
+++ b/src/server/CookingApp/Models/Allergy.cs
@@ -1,11 +1,14 @@
-using CookingApp.Infrastructure.Common;
-using MongoDB.Bson.Serialization.Attributes;
-
-public class Allergy : MongoEntity
+namespace CookingApp.Models
 {
-    [BsonElement("name")]
-    public string Name { get; set; }
+    using CookingApp.Infrastructure.Common;
+    using MongoDB.Bson.Serialization.Attributes;
+
+    public class Allergy : MongoEntity
+    {
+        [BsonElement("name")]
+        public string Name { get; set; }
 
-    [BsonElement("severity")]
-    public AllergySeverity Severity { get; set; }
+        [BsonElement("severity")]
+        public AllergySeverity Severity { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/src/server/CookingApp/Models/AllergySeverity.cs b/src/server/CookingApp/Models/AllergySeverity.cs
index 50131291..7131fa03 100644
--- a/src/server/CookingApp/Models/AllergySeverity.cs
+++ b/src/server/CookingApp/Models/AllergySeverity.cs
@@ -1,6 +1,9 @@
-public enum AllergySeverity
+namespace CookingApp.Models
 {
-    Mild,
-    Moderate,
-    Severe
+    public enum AllergySeverity
+    {
+        Mild,
+        Moderate,
+        Severe
+    }
 }
\ No newline at end of file
diff --git a/src/server/CookingApp/Models/Chat.cs b/src/server/CookingApp/Models/Chat.cs
index 80baa442..38d130ef 100644
--- a/src/server/CookingApp/Models/Chat.cs
+++ b/src/server/CookingApp/Models/Chat.cs
@@ -1,23 +1,26 @@
-using CookingApp.Infrastructure.Common;
-using MongoDB.Bson.Serialization.Attributes;
-
-public class Chat : MongoEntity
+namespace CookingApp.Models
 {
-    [BsonElement("ApiGeneratedId")]
-    public string ApiGeneratedId { get; set; }
+    using CookingApp.Infrastructure.Common;
+    using MongoDB.Bson.Serialization.Attributes;
+
+    public class Chat : MongoEntity
+    {
+        [BsonElement("ApiGeneratedId")]
+        public string ApiGeneratedId { get; set; }
 
-    [BsonElement("title")]
-    public string Title { get; set; }
+        [BsonElement("title")]
+        public string Title { get; set; }
 
-    [BsonElement("userId")]
-    public string UserId { get; set; }
+        [BsonElement("userId")]
+        public string UserId { get; set; }
 
-    [BsonElement("createdTime")]
-    public DateTime CreatedTime { get; set; }
+        [BsonElement("createdTime")]
+        public DateTime CreatedTime { get; set; }
 
-    [BsonElement("requests")]
-    public List<Request> Requests { get; set; } = new List<Request>();
+        [BsonElement("requests")]
+        public List<Request> Requests { get; set; } = new List<Request>();
 
-    [BsonElement("responses")]
-    public List<Response> Responses { get; set; } = new List<Response>();
+        [BsonElement("responses")]
+        public List<Response> Responses { get; set; } = new List<Response>();
+    }
 }
\ No newline at end of file
diff --git a/src/server/CookingApp/Models/DietaryPreference.cs b/src/server/CookingApp/Models/DietaryPreference.cs
index e10eed0e..76c3be28 100644
--- a/src/server/CookingApp/Models/DietaryPreference.cs
+++ b/src/server/CookingApp/Models/DietaryPreference.cs
@@ -1,6 +1,9 @@
-public enum DietaryPreference
+namespace CookingApp.Models
 {
-    None,
-    Vegan,
-    Vegetarian
+    public enum DietaryPreference
+    {
+        None,
+        Vegan,
+        Vegetarian
+    }
 }
\ No newline at end of file
diff --git a/src/server/CookingApp/Models/Food.cs b/src/server/CookingApp/Models/Food.cs
index 81ae9f0c..25778ac9 100644
--- a/src/server/CookingApp/Models/Food.cs
+++ b/src/server/CookingApp/Models/Food.cs
@@ -1,11 +1,14 @@
-using CookingApp.Infrastructure.Common;
-using MongoDB.Bson.Serialization.Attributes;
-
-public class Food : MongoEntity
+namespace CookingApp.Models
 {
-    [BsonElement("name")]
-    public string Name { get; set; }
+    using CookingApp.Infrastructure.Common;
+    using MongoDB.Bson.Serialization.Attributes;
+
+    public class Food : MongoEntity
+    {
+        [BsonElement("name")]
+        public string Name { get; set; }
 
-    [BsonElement("type")]
-    public FoodType Type { get; set; }
+        [BsonElement("type")]
+        public FoodType Type { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/src/server/CookingApp/Models/FoodType.cs b/src/server/CookingApp/Models/FoodType.cs
index ddf015b0..a0416e65 100644
--- a/src/server/CookingApp/Models/FoodType.cs
+++ b/src/server/CookingApp/Models/FoodType.cs
@@ -1,9 +1,12 @@
-public enum FoodType
+namespace CookingApp.Models
 {
-    Vegetable,
-    Fruit,
-    Grain,
-    Protein,
-    Dairy,
-    Other
+    public enum FoodType
+    {
+        Vegetable,
+        Fruit,
+        Grain,
+        Protein,
+        Dairy,
+        Other
+    }
 }
\ No newline at end of file
diff --git a/src/server/CookingApp/Models/Request.cs b/src/server/CookingApp/Models/Request.cs
index 36ba6f7a..e4498093 100644
--- a/src/server/CookingApp/Models/Request.cs
+++ b/src/server/CookingApp/Models/Request.cs
@@ -1,11 +1,14 @@
-using CookingApp.Infrastructure.Common;
-using MongoDB.Bson.Serialization.Attributes;
-
-public class Request : MongoEntity
+namespace CookingApp.Models
 {
-    [BsonElement("message")]
-    public string Message { get; set; }
+    using CookingApp.Infrastructure.Common;
+    using MongoDB.Bson.Serialization.Attributes;
+
+    public class Request : MongoEntity
+    {
+        [BsonElement("message")]
+        public string Message { get; set; }
 
-    [BsonElement("timestamp")]
-    public DateTime Timestamp { get; set; }
-}
+        [BsonElement("timestamp")]
+        public DateTime Timestamp { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/server/CookingApp/Models/Response.cs b/src/server/CookingApp/Models/Response.cs
index 3498854f..c517236f 100644
--- a/src/server/CookingApp/Models/Response.cs
+++ b/src/server/CookingApp/Models/Response.cs
@@ -1,11 +1,14 @@
-using CookingApp.Infrastructure.Common;
-using MongoDB.Bson.Serialization.Attributes;
-
-public class Response : MongoEntity
+namespace CookingApp.Models
 {
-    [BsonElement("message")]
-    public string Message { get; set; }
+    using CookingApp.Infrastructure.Common;
+    using MongoDB.Bson.Serialization.Attributes;
+
+    public class Response : MongoEntity
+    {
+        [BsonElement("message")]
+        public string Message { get; set; }
 
-    [BsonElement("timestamp")]
-    public DateTime Timestamp { get; set; }
+        [BsonElement("timestamp")]
+        public DateTime Timestamp { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/src/server/CookingApp/Models/User.cs b/src/server/CookingApp/Models/User.cs
index 6b2ab985..9d6416e0 100644
--- a/src/server/CookingApp/Models/User.cs
+++ b/src/server/CookingApp/Models/User.cs
@@ -1,26 +1,29 @@
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson;
-using System;
-using CookingApp.Infrastructure.Common;
-
-public class User : MongoEntity
+namespace CookingApp.Models
 {
-    [BsonId]
-    [BsonRepresentation(BsonType.ObjectId)]
-    public string Id { get; set; }
+    using MongoDB.Bson.Serialization.Attributes;
+    using MongoDB.Bson;
+    using System;
+    using CookingApp.Infrastructure.Common;
+
+    public class User : MongoEntity
+    {
+        [BsonId]
+        [BsonRepresentation(BsonType.ObjectId)]
+        public string Id { get; set; }
 
-    [BsonElement("name")]
-    public string Name { get; set; }
+        [BsonElement("name")]
+        public string Name { get; set; }
 
-    [BsonElement("dietaryPreference")]
-    public DietaryPreference DietaryPreference { get; set; }
+        [BsonElement("dietaryPreference")]
+        public DietaryPreference DietaryPreference { get; set; }
 
-    [BsonElement("allergies")]
-    public List<Allergy> Allergies { get; set; } = new List<Allergy>();
+        [BsonElement("allergies")]
+        public List<Allergy> Allergies { get; set; } = new List<Allergy>();
 
-    [BsonElement("avoidedFoods")]
-    public List<Food> AvoidedFoods { get; set; } = new List<Food>();
+        [BsonElement("avoidedFoods")]
+        public List<Food> AvoidedFoods { get; set; } = new List<Food>();
 
-    [BsonElement("chats")]
-    public List<Chat> Chats { get; set; } = new List<Chat>();
+        [BsonElement("chats")]
+        public List<Chat> Chats { get; set; } = new List<Chat>();
+    }
 }
\ No newline at end of file