diff --git a/aurora-sharp-desktop/Aurora/Design/Behaviors/BehaviorBase.cs b/aurora-sharp-desktop/Aurora/UserInterface/Behaviors/BehaviorBase.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Behaviors/BehaviorBase.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Behaviors/BehaviorBase.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Behaviors/EventToCommandBehavior.cs b/aurora-sharp-desktop/Aurora/UserInterface/Behaviors/EventToCommandBehavior.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Behaviors/EventToCommandBehavior.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Behaviors/EventToCommandBehavior.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/Dialogs/Modal.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Controls/Dialogs/Modal.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/Dialogs/Modal.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/Dialogs/Modal.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/Dialogs/Modal.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/Dialogs/Modal.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/Dialogs/Modal.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/Dialogs/Modal.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/HorizontalList/HorizontalList.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/HorizontalList/HorizontalList.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/HorizontalList/HorizontalList.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/HorizontalList/HorizontalList.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/ImageButton/ImageButton.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Controls/ImageButton/ImageButton.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/ImageButton/ImageButton.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/ImageButton/ImageButton.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/ImageButton/ImageButton.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/ImageButton/ImageButton.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/ImageButton/ImageButton.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/ImageButton/ImageButton.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/Library/Library.css b/aurora-sharp-desktop/Aurora/UserInterface/Controls/Library/Library.css
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/Library/Library.css
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/Library/Library.css
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/Library/Library.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Controls/Library/Library.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/Library/Library.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/Library/Library.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/Library/Library.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/Library/Library.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/Library/Library.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/Library/Library.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/MediaPlayer/Player.css b/aurora-sharp-desktop/Aurora/UserInterface/Controls/MediaPlayer/Player.css
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/MediaPlayer/Player.css
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/MediaPlayer/Player.css
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/MediaPlayer/Player.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Controls/MediaPlayer/Player.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/MediaPlayer/Player.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/MediaPlayer/Player.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/MediaPlayer/Player.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/MediaPlayer/Player.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/MediaPlayer/Player.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/MediaPlayer/Player.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/MemberList/MemberList.css b/aurora-sharp-desktop/Aurora/UserInterface/Controls/MemberList/MemberList.css
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/MemberList/MemberList.css
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/MemberList/MemberList.css
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/MemberList/MemberList.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Controls/MemberList/MemberList.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/MemberList/MemberList.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/MemberList/MemberList.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/MemberList/MemberList.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/MemberList/MemberList.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/MemberList/MemberList.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/MemberList/MemberList.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/NavigationMenu/NavigationGroupItem.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationGroupItem.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/NavigationMenu/NavigationGroupItem.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationGroupItem.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/NavigationMenu/NavigationItem.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationItem.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/NavigationMenu/NavigationItem.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationItem.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/NavigationMenu/NavigationMenu.css b/aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationMenu.css
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/NavigationMenu/NavigationMenu.css
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationMenu.css
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationMenu.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationMenu.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationMenu.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/NavigationMenu/NavigationMenu.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/TabView/TabItem.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/TabView/TabItem.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/TabView/TabItem.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/TabView/TabItem.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Components/TabView/TabView.cs b/aurora-sharp-desktop/Aurora/UserInterface/Controls/TabView/TabView.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Components/TabView/TabView.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Controls/TabView/TabView.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Converters/DoubleToLayoutOptions.cs b/aurora-sharp-desktop/Aurora/UserInterface/Converters/DoubleToLayoutOptions.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Converters/DoubleToLayoutOptions.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Converters/DoubleToLayoutOptions.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Converters/InverseBoolConverter.cs b/aurora-sharp-desktop/Aurora/UserInterface/Converters/InverseBoolConverter.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Converters/InverseBoolConverter.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Converters/InverseBoolConverter.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Converters/NullToBullConverter.cs b/aurora-sharp-desktop/Aurora/UserInterface/Converters/NullToBullConverter.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Converters/NullToBullConverter.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Converters/NullToBullConverter.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Converters/PlayIconConverter.cs b/aurora-sharp-desktop/Aurora/UserInterface/Converters/PlayIconConverter.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Converters/PlayIconConverter.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Converters/PlayIconConverter.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Converters/SelectedTabHeaderToTabBackgroundColorConverter.cs b/aurora-sharp-desktop/Aurora/UserInterface/Converters/SelectedTabHeaderToTabBackgroundColorConverter.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Converters/SelectedTabHeaderToTabBackgroundColorConverter.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Converters/SelectedTabHeaderToTabBackgroundColorConverter.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Converters/ToUpperConverter.cs b/aurora-sharp-desktop/Aurora/UserInterface/Converters/ToUpperConverter.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Converters/ToUpperConverter.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Converters/ToUpperConverter.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Extensions/ImageResourceExtension.cs b/aurora-sharp-desktop/Aurora/UserInterface/Extensions/ImageResourceExtension.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Extensions/ImageResourceExtension.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Extensions/ImageResourceExtension.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Albums/AlbumsView.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Views/Albums/AlbumsView.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Albums/AlbumsView.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Albums/AlbumsView.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Albums/AlbumsView.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Albums/AlbumsView.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Albums/AlbumsView.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Albums/AlbumsView.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Albums/AlbumsViewModel.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Albums/AlbumsViewModel.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Albums/AlbumsViewModel.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Albums/AlbumsViewModel.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Artists/ArtistsView.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Views/Artists/ArtistsView.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Artists/ArtistsView.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Artists/ArtistsView.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Artists/ArtistsView.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Artists/ArtistsView.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Artists/ArtistsView.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Artists/ArtistsView.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Artists/ArtistsViewModel.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Artists/ArtistsViewModel.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Artists/ArtistsViewModel.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Artists/ArtistsViewModel.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/BaseDialogViewModel.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/BaseDialogViewModel.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/BaseDialogViewModel.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/BaseDialogViewModel.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/BaseViewModel.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/BaseViewModel.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/BaseViewModel.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/BaseViewModel.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/MainView/MainView.css b/aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainView.css
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/MainView/MainView.css
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainView.css
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/MainView/MainView.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainView.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/MainView/MainView.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainView.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/MainView/MainView.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainView.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/MainView/MainView.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainView.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/MainView/MainViewModel.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainViewModel.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/MainView/MainViewModel.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/MainViewModel.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/MainView/PageContainer.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/PageContainer.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/MainView/PageContainer.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/PageContainer.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/MainView/PageContainer.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/PageContainer.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/MainView/PageContainer.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/MainView/PageContainer.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Party/NewPartyDialog/ConnectionDetails.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Party/NewPartyDialog/ConnectionDetails.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Party/NewPartyDialog/ConnectionDetails.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Party/NewPartyDialog/ConnectionDetails.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Party/NewPartyDialog/NewPartyDialog.css b/aurora-sharp-desktop/Aurora/UserInterface/Views/Party/NewPartyDialog/NewPartyDialog.css
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Party/NewPartyDialog/NewPartyDialog.css
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Party/NewPartyDialog/NewPartyDialog.css
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Party/NewPartyDialog/NewPartyDialog.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Views/Party/NewPartyDialog/NewPartyDialog.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Party/NewPartyDialog/NewPartyDialog.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Party/NewPartyDialog/NewPartyDialog.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Party/NewPartyDialog/NewPartyDialog.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Party/NewPartyDialog/NewPartyDialog.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Party/NewPartyDialog/NewPartyDialog.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Party/NewPartyDialog/NewPartyDialog.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Party/NewPartyDialog/NewPartyDialogViewModel.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Party/NewPartyDialog/NewPartyDialogViewModel.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Party/NewPartyDialog/NewPartyDialogViewModel.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Party/NewPartyDialog/NewPartyDialogViewModel.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Party/PartyView.css b/aurora-sharp-desktop/Aurora/UserInterface/Views/Party/PartyView.css
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Party/PartyView.css
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Party/PartyView.css
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Party/PartyView.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Views/Party/PartyView.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Party/PartyView.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Party/PartyView.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Party/PartyView.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Party/PartyView.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Party/PartyView.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Party/PartyView.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Party/PartyViewModel.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Party/PartyViewModel.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Party/PartyViewModel.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Party/PartyViewModel.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Profile/ProfileView.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Views/Profile/ProfileView.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Profile/ProfileView.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Profile/ProfileView.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Profile/ProfileView.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Profile/ProfileView.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Profile/ProfileView.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Profile/ProfileView.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Profile/ProfileViewModel.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Profile/ProfileViewModel.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Profile/ProfileViewModel.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Profile/ProfileViewModel.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Songs/SongsView.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Views/Songs/SongsView.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Songs/SongsView.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Songs/SongsView.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Songs/SongsView.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Songs/SongsView.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Songs/SongsView.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Songs/SongsView.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Songs/SongsViewModel.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Songs/SongsViewModel.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Songs/SongsViewModel.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Songs/SongsViewModel.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Stations/StationsViewModel.xaml b/aurora-sharp-desktop/Aurora/UserInterface/Views/Stations/StationsViewModel.xaml
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Stations/StationsViewModel.xaml
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Stations/StationsViewModel.xaml
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Stations/StationsViewModel.xaml.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Stations/StationsViewModel.xaml.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Stations/StationsViewModel.xaml.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Stations/StationsViewModel.xaml.cs
diff --git a/aurora-sharp-desktop/Aurora/Design/Views/Stations/StatiosnViewModel.cs b/aurora-sharp-desktop/Aurora/UserInterface/Views/Stations/StatiosnViewModel.cs
similarity index 100%
rename from aurora-sharp-desktop/Aurora/Design/Views/Stations/StatiosnViewModel.cs
rename to aurora-sharp-desktop/Aurora/UserInterface/Views/Stations/StatiosnViewModel.cs