diff --git a/Battify/App.xaml b/Battify/App.xaml
index 87f05dd..91c0a04 100644
--- a/Battify/App.xaml
+++ b/Battify/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Battify"
-             StartupUri="MainWindow.xaml">
+             StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
         <!-- Set the inherited default font for all WPF windows and controls. -->
         <Style TargetType="{x:Type Window}">
diff --git a/Battify/App.xaml.cs b/Battify/App.xaml.cs
index 1fe8d92..9d1de95 100644
--- a/Battify/App.xaml.cs
+++ b/Battify/App.xaml.cs
@@ -9,7 +9,7 @@ namespace Battify
     /// </summary>
     public partial class App : System.Windows.Application
     {
-        private static Mutex _mutex = null;
+        private static Mutex? _mutex;
         private const string MutexName = "Global\\Battify_SingleInstance_Mutex_9F8A3B2C";
 
         protected override void OnStartup(StartupEventArgs e)
diff --git a/Battify/Battify.csproj b/Battify/Battify.csproj
index 0969244..9b91580 100644
--- a/Battify/Battify.csproj
+++ b/Battify/Battify.csproj
@@ -78,7 +78,7 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>DefAlertSound.resx</DependentUpon>
     </Compile>
-    <Compile Update="Settings.Designer.cs">
+    <Compile Update="Configuration\Settings.Designer.cs">
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
@@ -111,9 +111,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Settings.settings">
+    <None Update="Configuration\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+      <CustomToolNamespace>Battify</CustomToolNamespace>
     </None>
   </ItemGroup>
 	
diff --git a/Battify/Settings.Designer.cs b/Battify/Configuration/Settings.Designer.cs
similarity index 98%
rename from Battify/Settings.Designer.cs
rename to Battify/Configuration/Settings.Designer.cs
index f3219b1..b8e71dd 100644
--- a/Battify/Settings.Designer.cs
+++ b/Battify/Configuration/Settings.Designer.cs
@@ -12,9 +12,9 @@ namespace Battify {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "18.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
         
         public static Settings Default {
@@ -22,7 +22,7 @@ public static Settings Default {
                 return defaultInstance;
             }
         }
-
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
@@ -34,6 +34,7 @@ public bool mute {
                 this["mute"] = value;
             }
         }
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
@@ -81,6 +82,7 @@ public string traytheme {
                 this["traytheme"] = value;
             }
         }
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("system")]
diff --git a/Battify/Settings.settings b/Battify/Configuration/Settings.settings
similarity index 100%
rename from Battify/Settings.settings
rename to Battify/Configuration/Settings.settings
diff --git a/Battify/DarkMenuRenderer.cs b/Battify/Controls/DarkMenuRenderer.cs
similarity index 100%
rename from Battify/DarkMenuRenderer.cs
rename to Battify/Controls/DarkMenuRenderer.cs
diff --git a/Battify/TrayControl.Designer.cs b/Battify/Controls/TrayControl.Designer.cs
similarity index 100%
rename from Battify/TrayControl.Designer.cs
rename to Battify/Controls/TrayControl.Designer.cs
diff --git a/Battify/TrayControl.cs b/Battify/Controls/TrayControl.cs
similarity index 98%
rename from Battify/TrayControl.cs
rename to Battify/Controls/TrayControl.cs
index 6f5e6a6..56148ab 100644
--- a/Battify/TrayControl.cs
+++ b/Battify/Controls/TrayControl.cs
@@ -5,7 +5,6 @@ namespace Battify
     public partial class TrayControl : UserControl
     {
         public MainWindow mainWindow;
-        private bool balloonHandlerRegistered = false;
 
         public TrayControl(MainWindow w)
         {
@@ -29,7 +28,6 @@ public TrayControl(MainWindow w)
 
             // BalloonTipClicked 이벤트를 한 번만 등록
             trayIcon.BalloonTipClicked += TrayIcon_BalloonTipClicked;
-            balloonHandlerRegistered = true;
 
             // 3초간 비동기 대기후 시작프로그램 체크
             Task.Run(async () =>
diff --git a/Battify/TrayControl.resx b/Battify/Controls/TrayControl.resx
similarity index 100%
rename from Battify/TrayControl.resx
rename to Battify/Controls/TrayControl.resx
diff --git a/Battify/BatteryInfoGetter.cs b/Battify/Services/BatteryInfoGetter.cs
similarity index 96%
rename from Battify/BatteryInfoGetter.cs
rename to Battify/Services/BatteryInfoGetter.cs
index d1068a7..9879561 100644
--- a/Battify/BatteryInfoGetter.cs
+++ b/Battify/Services/BatteryInfoGetter.cs
@@ -99,10 +99,8 @@ public static string Get(string parameter)
             {
                 return batteryInfo[parameter];
             }
-            else
-            {
-                return null;
-            }
+
+            return string.Empty;
         }
 
         public static void StartChecking(int interval = 5000)
@@ -118,9 +116,11 @@ public static void StartChecking(int interval = 5000)
 
         public static void StopChecking()
         {
-            if (!isChecking) return;
+            if (!isChecking || timer is null) return;
 
             timer.Stop();
+            timer.Dispose();
+            timer = null;
             isChecking = false;
         }
 
diff --git a/Battify/Localizer.cs b/Battify/Services/Localizer.cs
similarity index 100%
rename from Battify/Localizer.cs
rename to Battify/Services/Localizer.cs
diff --git a/Battify/MsixStartupSetter.cs b/Battify/Services/MsixStartupSetter.cs
similarity index 100%
rename from Battify/MsixStartupSetter.cs
rename to Battify/Services/MsixStartupSetter.cs
diff --git a/Battify/StartupSetter.cs b/Battify/Services/StartupSetter.cs
similarity index 95%
rename from Battify/StartupSetter.cs
rename to Battify/Services/StartupSetter.cs
index 6a8f710..2adc993 100644
--- a/Battify/StartupSetter.cs
+++ b/Battify/Services/StartupSetter.cs
@@ -26,7 +26,7 @@ public static bool CheckStartup()
             using var key = Registry.CurrentUser.OpenSubKey(RunKeyPath, writable: false);
             var value = key?.GetValue(ValueName) as string;
 
-            if (string.IsNullOrWhiteSpace(value))
+            if (value is null || string.IsNullOrWhiteSpace(value))
                 return false;
 
             return string.Equals(value.Trim(), QuoteExecutablePath(GetExecutablePath()), StringComparison.OrdinalIgnoreCase);
diff --git a/Battify/WindowsInfoGetter.cs b/Battify/Services/WindowsInfoGetter.cs
similarity index 100%
rename from Battify/WindowsInfoGetter.cs
rename to Battify/Services/WindowsInfoGetter.cs
diff --git a/Battify/BatteryInfoWindow.xaml b/Battify/Views/BatteryInfoWindow.xaml
similarity index 100%
rename from Battify/BatteryInfoWindow.xaml
rename to Battify/Views/BatteryInfoWindow.xaml
diff --git a/Battify/BatteryInfoWindow.xaml.cs b/Battify/Views/BatteryInfoWindow.xaml.cs
similarity index 100%
rename from Battify/BatteryInfoWindow.xaml.cs
rename to Battify/Views/BatteryInfoWindow.xaml.cs
diff --git a/Battify/MainWindow.xaml b/Battify/Views/MainWindow.xaml
similarity index 100%
rename from Battify/MainWindow.xaml
rename to Battify/Views/MainWindow.xaml
diff --git a/Battify/MainWindow.xaml.cs b/Battify/Views/MainWindow.xaml.cs
similarity index 98%
rename from Battify/MainWindow.xaml.cs
rename to Battify/Views/MainWindow.xaml.cs
index cbc2406..f7f0c72 100644
--- a/Battify/MainWindow.xaml.cs
+++ b/Battify/Views/MainWindow.xaml.cs
@@ -455,9 +455,9 @@ public void UpdateIcon(int percentage)
 
             Icon icon = effectiveTrayTheme switch
             {
-                "white" => BattIconWhite.ResourceManager.GetObject("_" + percentage.ToString()) as Icon,
-                "black" => BattIconBlack.ResourceManager.GetObject("_" + percentage.ToString()) as Icon,
-                _ => BattIconWhite.ResourceManager.GetObject("_" + percentage.ToString()) as Icon
+                "white" => BattIconWhite.ResourceManager.GetObject("_" + percentage.ToString()) as Icon ?? SystemIcons.Application,
+                "black" => BattIconBlack.ResourceManager.GetObject("_" + percentage.ToString()) as Icon ?? SystemIcons.Application,
+                _ => BattIconWhite.ResourceManager.GetObject("_" + percentage.ToString()) as Icon ?? SystemIcons.Application
             };
 
             trayControl.trayIcon.Icon = icon;
diff --git a/Battify/TrayGuideWindow.xaml b/Battify/Views/TrayGuideWindow.xaml
similarity index 100%
rename from Battify/TrayGuideWindow.xaml
rename to Battify/Views/TrayGuideWindow.xaml
diff --git a/Battify/TrayGuideWindow.xaml.cs b/Battify/Views/TrayGuideWindow.xaml.cs
similarity index 100%
rename from Battify/TrayGuideWindow.xaml.cs
rename to Battify/Views/TrayGuideWindow.xaml.cs
diff --git a/Battify/icon.png b/Battify/icon.png
deleted file mode 100644
index 1631ac4..0000000
Binary files a/Battify/icon.png and /dev/null differ
diff --git a/Battify/icon_old.ico b/Battify/icon_old.ico
deleted file mode 100644
index b63cbd6..0000000
Binary files a/Battify/icon_old.ico and /dev/null differ