diff --git a/Library/AppearanceWindow.xaml b/Library/AppearanceWindow.xaml
index f40917e..ab64504 100644
--- a/Library/AppearanceWindow.xaml
+++ b/Library/AppearanceWindow.xaml
@@ -1,12 +1,12 @@
 <Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:properties="clr-namespace:ChrisKaczor.Wpf.FloatingStatusWindow.Properties"
+        xmlns:properties="clr-namespace:ChrisKaczor.Wpf.Windows.FloatingStatusWindow.Properties"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:local="clr-namespace:ChrisKaczor.Wpf.FloatingStatusWindow"
+        xmlns:local="clr-namespace:ChrisKaczor.Wpf.Windows.FloatingStatusWindow"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:windows="clr-namespace:ChrisKaczor.Wpf.Windows;assembly=ChrisKaczor.Wpf.Windows.ControlBox"
-        x:Class="ChrisKaczor.Wpf.FloatingStatusWindow.AppearanceWindow"
+        x:Class="ChrisKaczor.Wpf.Windows.FloatingStatusWindow.AppearanceWindow"
         Title="{x:Static properties:Resources.ChangeAppearanceWindow}"
         Height="290"
         Width="450"
diff --git a/Library/AppearanceWindow.xaml.cs b/Library/AppearanceWindow.xaml.cs
index b021b61..a803aae 100644
--- a/Library/AppearanceWindow.xaml.cs
+++ b/Library/AppearanceWindow.xaml.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Windows.Media;
 
-namespace ChrisKaczor.Wpf.FloatingStatusWindow;
+namespace ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 
 internal partial class AppearanceWindow
 {
diff --git a/Library/FloatingStatusWindow.cs b/Library/FloatingStatusWindow.cs
index 45afd95..7c909f6 100644
--- a/Library/FloatingStatusWindow.cs
+++ b/Library/FloatingStatusWindow.cs
@@ -1,11 +1,11 @@
-using ChrisKaczor.Wpf.FloatingStatusWindow.Properties;
+using ChrisKaczor.Wpf.Windows.FloatingStatusWindow.Properties;
 using H.NotifyIcon;
 using JetBrains.Annotations;
 using System;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace ChrisKaczor.Wpf.FloatingStatusWindow;
+namespace ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 
 [PublicAPI]
 public class FloatingStatusWindow : IDisposable
diff --git a/Library/FloatingStatusWindow.csproj b/Library/FloatingStatusWindow.csproj
index 6fd8a0a..ba212b6 100644
--- a/Library/FloatingStatusWindow.csproj
+++ b/Library/FloatingStatusWindow.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <TargetFramework>net7.0-windows</TargetFramework>
     <OutputType>Library</OutputType>
-    <RootNamespace>ChrisKaczor.Wpf.FloatingStatusWindow</RootNamespace>
-    <AssemblyName>ChrisKaczor.Wpf.FloatingStatusWindow</AssemblyName>
+    <RootNamespace>ChrisKaczor.Wpf.Windows.FloatingStatusWindow</RootNamespace>
+    <AssemblyName>ChrisKaczor.Wpf.Windows.FloatingStatusWindow</AssemblyName>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
diff --git a/Library/IWindowSource.cs b/Library/IWindowSource.cs
index fa364c5..3d06bd8 100644
--- a/Library/IWindowSource.cs
+++ b/Library/IWindowSource.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Drawing;
 
-namespace ChrisKaczor.Wpf.FloatingStatusWindow;
+namespace ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 
 public interface IWindowSource
 {
diff --git a/Library/MainWindow.xaml b/Library/MainWindow.xaml
index 54a3af0..ceadb30 100644
--- a/Library/MainWindow.xaml
+++ b/Library/MainWindow.xaml
@@ -1,4 +1,4 @@
-<snappingWindow:SnappingWindow x:Class="ChrisKaczor.Wpf.FloatingStatusWindow.MainWindow"
+<snappingWindow:SnappingWindow x:Class="ChrisKaczor.Wpf.Windows.FloatingStatusWindow.MainWindow"
                                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                                xmlns:snappingWindow="clr-namespace:ChrisKaczor.Wpf.Windows;assembly=ChrisKaczor.Wpf.Windows.SnappingWindow"
diff --git a/Library/MainWindow.xaml.cs b/Library/MainWindow.xaml.cs
index 47840c8..44a2193 100644
--- a/Library/MainWindow.xaml.cs
+++ b/Library/MainWindow.xaml.cs
@@ -7,7 +7,7 @@ using System.Windows.Media;
 using System.Windows.Shell;
 using System.Windows.Threading;
 
-namespace ChrisKaczor.Wpf.FloatingStatusWindow;
+namespace ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 
 internal partial class MainWindow
 {
diff --git a/Library/Properties/Resources.Designer.cs b/Library/Properties/Resources.Designer.cs
index 963fa9f..f9116c7 100644
--- a/Library/Properties/Resources.Designer.cs
+++ b/Library/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ChrisKaczor.Wpf.FloatingStatusWindow.Properties {
+namespace ChrisKaczor.Wpf.Windows.FloatingStatusWindow.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace ChrisKaczor.Wpf.FloatingStatusWindow.Properties {
         public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ChrisKaczor.Wpf.FloatingStatusWindow.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ChrisKaczor.Wpf.Windows.FloatingStatusWindow.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Library/StartManager.cs b/Library/StartManager.cs
index ee305f0..24088c6 100644
--- a/Library/StartManager.cs
+++ b/Library/StartManager.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Windows;
 
-namespace ChrisKaczor.Wpf.FloatingStatusWindow;
+namespace ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 
 public static class StartManager
 {
diff --git a/Library/WindowManager.cs b/Library/WindowManager.cs
index c85354e..e9e1aaf 100644
--- a/Library/WindowManager.cs
+++ b/Library/WindowManager.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace ChrisKaczor.Wpf.FloatingStatusWindow;
+namespace ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 
 public static partial class WindowManager
 {
diff --git a/Library/WindowSettings.cs b/Library/WindowSettings.cs
index 29f94af..14040ba 100644
--- a/Library/WindowSettings.cs
+++ b/Library/WindowSettings.cs
@@ -9,7 +9,7 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using System.Xml.Serialization;
 
-namespace ChrisKaczor.Wpf.FloatingStatusWindow;
+namespace ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 
 [PublicAPI]
 public class WindowSettings : ICloneable
diff --git a/TestWindow/App.xaml.cs b/TestWindow/App.xaml.cs
index ca9c8d9..e2cbcda 100644
--- a/TestWindow/App.xaml.cs
+++ b/TestWindow/App.xaml.cs
@@ -1,4 +1,4 @@
-using ChrisKaczor.Wpf.FloatingStatusWindow;
+using ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/TestWindow/WindowSource1.cs b/TestWindow/WindowSource1.cs
index fea595c..3b565e2 100644
--- a/TestWindow/WindowSource1.cs
+++ b/TestWindow/WindowSource1.cs
@@ -1,4 +1,4 @@
-using ChrisKaczor.Wpf.FloatingStatusWindow;
+using ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 using System;
 using System.Globalization;
 using System.Reflection;
diff --git a/TestWindow/WindowSource2.cs b/TestWindow/WindowSource2.cs
index b95ecff..ebefa9c 100644
--- a/TestWindow/WindowSource2.cs
+++ b/TestWindow/WindowSource2.cs
@@ -1,4 +1,4 @@
-using ChrisKaczor.Wpf.FloatingStatusWindow;
+using ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 using System;
 using System.Globalization;
 using System.Reflection;
diff --git a/TestWindow/WindowSource3.cs b/TestWindow/WindowSource3.cs
index dca0d2d..26ef1ed 100644
--- a/TestWindow/WindowSource3.cs
+++ b/TestWindow/WindowSource3.cs
@@ -1,4 +1,4 @@
-using ChrisKaczor.Wpf.FloatingStatusWindow;
+using ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 using System;
 using System.Globalization;
 using System.Reflection;
diff --git a/TestWindow/WindowSource4.cs b/TestWindow/WindowSource4.cs
index adc5d5e..fb71c4d 100644
--- a/TestWindow/WindowSource4.cs
+++ b/TestWindow/WindowSource4.cs
@@ -1,4 +1,4 @@
-using ChrisKaczor.Wpf.FloatingStatusWindow;
+using ChrisKaczor.Wpf.Windows.FloatingStatusWindow;
 using System;
 using System.Globalization;
 using System.Reflection;