diff --git a/Controllers/BundleController.cs b/Controllers/BundleController.cs
index a802a34..9e5c2d9 100644
--- a/Controllers/BundleController.cs
+++ b/Controllers/BundleController.cs
@@ -1,132 +1,145 @@
 using System.Data;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using MyDarling.Models;
 
 namespace MyDarling.Controllers
 {
-    public class BundleController : Controller
-    {
-        private DataContext context;
-        private IWebHostEnvironment environment;
+	public class BundleController : Controller
+	{
+		private DataContext context;
+		private IWebHostEnvironment environment;
 
-        public BundleController(DataContext context, IWebHostEnvironment environment)
-        {
-            this.environment = environment;
-            this.context = context;
-        }
+		public BundleController(DataContext context, IWebHostEnvironment environment)
+		{
+			this.environment = environment;
+			this.context = context;
+		}
 
-        public ActionResult Index()
-        {
-            return View(context.UnderwearBundles.Include(b => b.Figures));
-        }
+		public ActionResult Index()
+		{
+			return View(context.UnderwearBundles.Include(b => b.Figures));
+		}
 
-        public ActionResult Create()
-        {
-            return View();
-        }
+		public ActionResult Create()
+		{
+			return View();
+		}
 
-        [HttpPost]
-        public async Task<ActionResult> Create([Bind] UnderwearBundle bundle)
-        {
-            try
-            {
-                if (ModelState.IsValid)
-                {
-                    await context.UnderwearBundles.AddAsync(bundle);
-                    context.SaveChanges();
-                    return RedirectToAction(nameof(Index));
-                }
-            }
-            catch (DataException)
-            {
-                ModelState.AddModelError("", "Unable to save changes");
-            }
-            return View(bundle);
-        }
+		[HttpPost]
+		public async Task<ActionResult> Create([Bind] UnderwearBundle bundle)
+		{
+			try
+			{
+				if (ModelState.IsValid)
+				{
+					await context.UnderwearBundles.AddAsync(bundle);
+					context.SaveChanges();
+					return RedirectToAction(nameof(Index));
+				}
+			}
+			catch (DataException)
+			{
+				ModelState.AddModelError("", "Unable to save changes");
+			}
+			return View(bundle);
+		}
 
-        public async Task<ActionResult> Details(int id)
-        {
-            return View(await context.UnderwearBundles.Include(b => b.Figures).Where(b => b.Id == id).FirstOrDefaultAsync());
-        }
+		public async Task<ActionResult> Details(int id)
+		{
+			return View(await context.UnderwearBundles.Include(b => b.Figures).Where(b => b.Id == id).FirstOrDefaultAsync());
+		}
 
-        public async Task<ActionResult> Edit(int id)
-        {
-            return View(nameof(Details), await context.UnderwearBundles.FindAsync(id));
-        }
+		public async Task<ActionResult> Edit(int id)
+		{
+			return View(nameof(Details), await context.UnderwearBundles.FindAsync(id));
+		}
 
-        [HttpPost]
-        public async Task<ActionResult> Edit(int? id)
-        {
+		[HttpPost]
+		public async Task<ActionResult> Edit(int? id)
+		{
 
-            if (id == null)
-            {
-                return NotFound();
-            }
+			if (id == null)
+			{
+				return NotFound();
+			}
 
-            var bundle = await context.UnderwearBundles.FindAsync(id);
-            if (bundle == null)
-            {
-                return NotFound();
-            }
+			var bundle = await context.UnderwearBundles.FindAsync(id);
+			if (bundle == null)
+			{
+				return NotFound();
+			}
 
-            var file = Request.Form.Files.FirstOrDefault();
+			var file = Request.Form.Files.FirstOrDefault();
 
-            if (await TryUpdateModelAsync<UnderwearBundle>(
-                bundle,
-                "",
-                b => b.Name, b => b.Description, b => b.Figures, b => b.Price))
-            {
-                if (file != null)
-                {
-                    var newFigure = new Figure();
-                    bundle.Figures.Add(newFigure);
-                    newFigure.FilePath = $"/Content/{bundle.Id}/{Guid.NewGuid()}{Path.GetExtension(file.FileName)}";
-                    var savePath = environment.WebRootPath + "/Content/" + bundle.Id + "/";
-                    if (!Directory.Exists(savePath))
-                    {
-                        Directory.CreateDirectory(savePath);
-                    }
-                    using var fileStream = new FileStream(environment.WebRootPath + newFigure.FilePath, FileMode.Create);
-                    await file.CopyToAsync(fileStream);
-                }
+			if (await TryUpdateModelAsync<UnderwearBundle>(
+				bundle,
+				"",
+				b => b.Name, b => b.Description, b => b.Figures, b => b.Price))
+			{
+				if (file != null)
+				{
+					var newFigure = new Figure();
+					bundle.Figures.Add(newFigure);
+					newFigure.FilePath = $"/Content/{bundle.Id}/{Guid.NewGuid()}{Path.GetExtension(file.FileName)}";
+					var savePath = environment.WebRootPath + "/Content/" + bundle.Id + "/";
+					if (!Directory.Exists(savePath))
+					{
+						Directory.CreateDirectory(savePath);
+					}
+					using var fileStream = new FileStream(environment.WebRootPath + newFigure.FilePath, FileMode.Create);
+					await file.CopyToAsync(fileStream);
+				}
 
-                try
-                {
-                    await context.SaveChangesAsync();
-                    return RedirectToAction(nameof(Index));
-                }
+				try
+				{
+					await context.SaveChangesAsync();
+					return RedirectToAction(nameof(Index));
+				}
 
-                catch (System.Exception)
-                {
-                    ModelState.AddModelError("", "Unable to save changes");
-                }
+				catch (System.Exception)
+				{
+					ModelState.AddModelError("", "Unable to save changes");
+				}
 
 
-            }
-            return View(bundle);
-        }
+			}
+			return View(bundle);
+		}
 
-        [HttpPost]
-        public async Task<ActionResult> Delete(int id)
-        {
-            var bundleToDelete = await context.UnderwearBundles.FindAsync(id);
-            if (bundleToDelete == null)
-            {
-                return NotFound();
-            }
+		[HttpPost]
+		public async Task<ActionResult> Delete(int id)
+		{
+			var bundleToDelete = await context.UnderwearBundles.FindAsync(id);
+			if (bundleToDelete == null)
+			{
+				return NotFound();
+			}
 
-            try
-            {
-                context.UnderwearBundles.Remove(bundleToDelete);
-                await context.SaveChangesAsync();
-                return RedirectToAction(nameof(Index));
-            }
-            catch (DbUpdateException)
-            {
-                return RedirectToAction(nameof(Delete), new { id = id, saveChangesError = true });
-            }
-        }
-    }
+			try
+			{
+				var bundleDirPath = String.Concat(environment.WebRootPath,
+					"/Content/",
+					bundleToDelete.Id);
+					
+				if (Directory.Exists(bundleDirPath))
+				{
+					Directory.Delete(bundleDirPath, true);
+				}
+				// foreach (var figure in bundleToDelete.Figures)
+				// {
+				// 	using FigureController controller = new(context, environment);
+				// 	await controller.Delete(figure.Id);
+				// }
+				
+				context.UnderwearBundles.Remove(bundleToDelete);
+				await context.SaveChangesAsync();
+				return RedirectToAction(nameof(Index));
+			}
+			catch (DbUpdateException)
+			{
+				return RedirectToAction(nameof(Delete), new { id = id, saveChangesError = true });
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/Controllers/FigureController.cs b/Controllers/FigureController.cs
index 03616bc..3329968 100644
--- a/Controllers/FigureController.cs
+++ b/Controllers/FigureController.cs
@@ -8,9 +8,11 @@ namespace MyDarling.Controllers
 	public class FigureController : Controller
 	{
 		private DataContext context;
-		public FigureController(DataContext context)
+		private IWebHostEnvironment environment;
+		public FigureController(DataContext context, IWebHostEnvironment environment)
 		{
 			this.context = context;
+			this.environment = environment;
 		}
 
 		public async Task<IActionResult> Details(int id)
@@ -56,24 +58,30 @@ namespace MyDarling.Controllers
 		}
 		
 		[HttpPost]
-        public async Task<ActionResult> Delete(int id)
-        {
-            var figureToDelete = await context.Figures.FindAsync(id);
-            if (figureToDelete == null)
-            {
-                return NotFound();
-            }
+		public async Task<ActionResult> Delete(int id)
+		{
+			var figureToDelete = await context.Figures.FindAsync(id);
+			if (figureToDelete == null)
+			{
+				return NotFound();
+			}
 
-            try
-            {
-                context.Figures.Remove(figureToDelete);
-                await context.SaveChangesAsync();
-                return RedirectToAction(nameof(Index), "Bundle");
-            }
-            catch (DbUpdateException)
-            {
-                return RedirectToAction(nameof(Delete), new { id = id, saveChangesError = true });
-            }
-        }
+			try
+			{
+				FileInfo figureFile = new FileInfo(environment.WebRootPath + figureToDelete.FilePath);
+				if (figureFile.Exists)
+				{
+					figureFile.Delete();
+				}
+				
+				context.Figures.Remove(figureToDelete);
+				await context.SaveChangesAsync();
+				return RedirectToAction(nameof(Index), "Bundle");
+			}
+			catch (DbUpdateException)
+			{
+				return RedirectToAction(nameof(Delete), new { id = id, saveChangesError = true });
+			}
+		}
 	}
 }
\ No newline at end of file