diff --git a/src/CamBooth/CamBooth.App/App.xaml.cs b/src/CamBooth/CamBooth.App/App.xaml.cs
index 1c75363..3b5a2bd 100644
--- a/src/CamBooth/CamBooth.App/App.xaml.cs
+++ b/src/CamBooth/CamBooth.App/App.xaml.cs
@@ -1,13 +1,8 @@
-using System.ComponentModel;
-using System.Configuration;
-using System.Data;
-using System.Windows;
+using System.Windows;
 
 using CamBooth.App.Core.AppSettings;
-using CamBooth.App.Core.Camera;
+using CamBooth.App.Camera;
 using CamBooth.App.Core.Logging;
-using CamBooth.App.DebugConsole;
-using CamBooth.App.LiveView;
 using CamBooth.App.PictureGallery;
 
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/CamBooth/CamBooth.App/Core/Camera/CameraService.cs b/src/CamBooth/CamBooth.App/Camera/CameraService.cs
similarity index 99%
rename from src/CamBooth/CamBooth.App/Core/Camera/CameraService.cs
rename to src/CamBooth/CamBooth.App/Camera/CameraService.cs
index 8bceefa..dbabcd2 100644
--- a/src/CamBooth/CamBooth.App/Core/Camera/CameraService.cs
+++ b/src/CamBooth/CamBooth.App/Camera/CameraService.cs
@@ -12,7 +12,7 @@ using CamBooth.App.PictureGallery;
 using EOSDigital.API;
 using EOSDigital.SDK;
 
-namespace CamBooth.App.Core.Camera;
+namespace CamBooth.App.Camera;
 
 public class CameraService : IDisposable
 {
diff --git a/src/CamBooth/CamBooth.App/LiveView/LiveViewPage.xaml.cs b/src/CamBooth/CamBooth.App/LiveView/LiveViewPage.xaml.cs
index c632022..9a20e5e 100644
--- a/src/CamBooth/CamBooth.App/LiveView/LiveViewPage.xaml.cs
+++ b/src/CamBooth/CamBooth.App/LiveView/LiveViewPage.xaml.cs
@@ -7,7 +7,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
 using CamBooth.App.Core.AppSettings;
-using CamBooth.App.Core.Camera;
+using CamBooth.App.Camera;
 using CamBooth.App.Core.Logging;
 
 using EOSDigital.API;
@@ -41,7 +41,7 @@ public partial class LiveViewPage : Page
 	}
 
 
-	private void MainCamera_OnLiveViewUpdated(Camera sender, Stream img)
+	private void MainCamera_OnLiveViewUpdated(EOSDigital.API.Camera sender, Stream img)
 	{
 		try
 		{
diff --git a/src/CamBooth/CamBooth.App/MainWindow.xaml.cs b/src/CamBooth/CamBooth.App/MainWindow.xaml.cs
index b8edd54..e65eedd 100644
--- a/src/CamBooth/CamBooth.App/MainWindow.xaml.cs
+++ b/src/CamBooth/CamBooth.App/MainWindow.xaml.cs
@@ -1,19 +1,13 @@
 using System.ComponentModel;
 using System.Windows;
-using System.Windows.Controls;
 
-using CamBooth.App.Core;
+using CamBooth.App.Camera;
 using CamBooth.App.Core.AppSettings;
-using CamBooth.App.Core.Camera;
 using CamBooth.App.Core.Logging;
 using CamBooth.App.DebugConsole;
 using CamBooth.App.LiveView;
 using CamBooth.App.PictureGallery;
 
-using Wpf.Ui.Controls;
-
-using MessageBox = Wpf.Ui.Controls.MessageBox;
-
 namespace CamBooth.App;
 
 /// <summary>