diff --git a/SongBrowserPlugin/SongBrowserPlugin.csproj b/SongBrowserPlugin/SongBrowserPlugin.csproj
index 008368b..eb7d0bb 100644
--- a/SongBrowserPlugin/SongBrowserPlugin.csproj
+++ b/SongBrowserPlugin/SongBrowserPlugin.csproj
@@ -116,8 +116,8 @@
     <Compile Include="UI\Playlists\PlaylistSelectionNavigationController.cs" />
     <Compile Include="UI\Playlists\PlaylistTableView.cs" />
     <Compile Include="UI\Base64Sprites.cs" />
-    <Compile Include="UI\CustomUIKeyboard.cs" />
-    <Compile Include="UI\SearchKeyboardViewController.cs" />
+    <Compile Include="UI\Keyboard\CustomUIKeyboard.cs" />
+    <Compile Include="UI\Keyboard\SearchKeyboardViewController.cs" />
     <Compile Include="UI\SongBrowserUI.cs" />
     <Compile Include="UI\SongFilterButton.cs" />
     <Compile Include="UI\SongSortButton.cs" />
diff --git a/SongBrowserPlugin/UI/SongBrowserUI.cs b/SongBrowserPlugin/UI/Browser/SongBrowserUI.cs
similarity index 100%
rename from SongBrowserPlugin/UI/SongBrowserUI.cs
rename to SongBrowserPlugin/UI/Browser/SongBrowserUI.cs
diff --git a/SongBrowserPlugin/UI/SongFilterButton.cs b/SongBrowserPlugin/UI/Browser/SongFilterButton.cs
similarity index 100%
rename from SongBrowserPlugin/UI/SongFilterButton.cs
rename to SongBrowserPlugin/UI/Browser/SongFilterButton.cs
diff --git a/SongBrowserPlugin/UI/SongSortButton.cs b/SongBrowserPlugin/UI/Browser/SongSortButton.cs
similarity index 100%
rename from SongBrowserPlugin/UI/SongSortButton.cs
rename to SongBrowserPlugin/UI/Browser/SongSortButton.cs