diff --git a/QSB/EchoesOfTheEye/WineCellar/Messages/WineCellarSwitchMessage.cs b/QSB/EchoesOfTheEye/WineCellar/Messages/WineCellarSwitchMessage.cs
index 11cfaa36..88c82005 100644
--- a/QSB/EchoesOfTheEye/WineCellar/Messages/WineCellarSwitchMessage.cs
+++ b/QSB/EchoesOfTheEye/WineCellar/Messages/WineCellarSwitchMessage.cs
@@ -1,4 +1,5 @@
-using QSB.Messaging;
+using QSB.EchoesOfTheEye.WineCellar.WorldObjects;
+using QSB.Messaging;
 
 namespace QSB.EchoesOfTheEye.WineCellar.Messages;
 
diff --git a/QSB/EchoesOfTheEye/WineCellar/Patches/WineCellarPatches.cs b/QSB/EchoesOfTheEye/WineCellar/Patches/WineCellarPatches.cs
index d020297f..40a4100c 100644
--- a/QSB/EchoesOfTheEye/WineCellar/Patches/WineCellarPatches.cs
+++ b/QSB/EchoesOfTheEye/WineCellar/Patches/WineCellarPatches.cs
@@ -1,5 +1,6 @@
 using HarmonyLib;
 using QSB.EchoesOfTheEye.WineCellar.Messages;
+using QSB.EchoesOfTheEye.WineCellar.WorldObjects;
 using QSB.Messaging;
 using QSB.Patches;
 using QSB.WorldSync;
@@ -16,7 +17,7 @@ internal class WineCellarPatches : QSBPatch
 	{
 		if (Remote)
 		{
-			return; 
+			return;
 		}
 
 		var worldObject = __instance.GetWorldObject<QSBWineCellarSwitch>();
diff --git a/QSB/EchoesOfTheEye/WineCellar/WineCellarManager.cs b/QSB/EchoesOfTheEye/WineCellar/WineCellarManager.cs
index 84d7dc3d..e9b52357 100644
--- a/QSB/EchoesOfTheEye/WineCellar/WineCellarManager.cs
+++ b/QSB/EchoesOfTheEye/WineCellar/WineCellarManager.cs
@@ -1,4 +1,5 @@
 using Cysharp.Threading.Tasks;
+using QSB.EchoesOfTheEye.WineCellar.WorldObjects;
 using QSB.WorldSync;
 using System.Threading;
 
@@ -9,6 +10,6 @@ internal class WineCellarManager : WorldObjectManager
 	public override WorldObjectScene WorldObjectScene => WorldObjectScene.SolarSystem;
 	public override bool DlcOnly => true;
 
-	public async override UniTask BuildWorldObjects(OWScene scene, CancellationToken ct)
+	public override async UniTask BuildWorldObjects(OWScene scene, CancellationToken ct)
 		=> QSBWorldSync.Init<QSBWineCellarSwitch, WineCellarSwitch>();
 }
diff --git a/QSB/EchoesOfTheEye/WineCellar/QSBWineCellarSwitch.cs b/QSB/EchoesOfTheEye/WineCellar/WorldObjects/QSBWineCellarSwitch.cs
similarity index 59%
rename from QSB/EchoesOfTheEye/WineCellar/QSBWineCellarSwitch.cs
rename to QSB/EchoesOfTheEye/WineCellar/WorldObjects/QSBWineCellarSwitch.cs
index b8809b8c..20b4e3c5 100644
--- a/QSB/EchoesOfTheEye/WineCellar/QSBWineCellarSwitch.cs
+++ b/QSB/EchoesOfTheEye/WineCellar/WorldObjects/QSBWineCellarSwitch.cs
@@ -1,5 +1,5 @@
 using QSB.WorldSync;
 
-namespace QSB.EchoesOfTheEye.WineCellar;
+namespace QSB.EchoesOfTheEye.WineCellar.WorldObjects;
 
-internal class QSBWineCellarSwitch : WorldObject<WineCellarSwitch> { }
\ No newline at end of file
+internal class QSBWineCellarSwitch : WorldObject<WineCellarSwitch> { }