SEBWIN-362: Cleaned up mobile UI implementations.

SafeExamBrowser.Client/CompositionRoot.cs

@@ -274,7 +274,7 @@ namespace SafeExamBrowser.Client
 			switch (uiMode)
 			{
 				case UserInterfaceMode.Mobile:
-					return new Mobile.ActionCenter();
+					return new Mobile.Windows.ActionCenter();
 				default:
 					return new Desktop.Windows.ActionCenter();
 			}
@@ -307,7 +307,7 @@ namespace SafeExamBrowser.Client
 			switch (uiMode)
 			{
 				case UserInterfaceMode.Mobile:
-					return new Mobile.Taskbar(ModuleLogger(nameof(Mobile.Taskbar)));
+					return new Mobile.Windows.Taskbar(ModuleLogger(nameof(Mobile.Windows.Taskbar)));
 				default:
 					return new Desktop.Windows.Taskbar(ModuleLogger(nameof(Desktop.Windows.Taskbar)));
 			}
@@ -318,7 +318,7 @@ namespace SafeExamBrowser.Client
 			switch (uiMode)
 			{
 				case UserInterfaceMode.Mobile:
-					return new Mobile.Taskview();
+					return new Mobile.Windows.Taskview();
 				default:
 					return new Desktop.Windows.Taskview();
 			}

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationButton.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterApplicationButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.ApplicationButton" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationButton.xaml.cs

@@ -12,16 +12,16 @@ using SafeExamBrowser.Applications.Contracts;
 using SafeExamBrowser.Applications.Contracts.Resources.Icons;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterApplicationButton : UserControl
+	internal partial class ApplicationButton : UserControl
 	{
 		private IApplication application;
 		private IApplicationWindow window;
 
 		internal event EventHandler Clicked;
 
-		public ActionCenterApplicationButton(IApplication application, IApplicationWindow window = null)
+		internal ApplicationButton(IApplication application, IApplicationWindow window = null)
 		{
 			this.application = application;
 			this.window = window;

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterApplicationControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.ApplicationControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,9 +8,9 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
-                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/ApplicationControl.xaml.cs

@@ -11,13 +11,13 @@ using System.Windows.Controls;
 using SafeExamBrowser.Applications.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterApplicationControl : UserControl, IApplicationControl
+	internal partial class ApplicationControl : UserControl, IApplicationControl
 	{
 		private IApplication application;
 
-		public ActionCenterApplicationControl(IApplication application)
+		internal ApplicationControl(IApplication application)
 		{
 			this.application = application;
 
@@ -27,7 +27,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 
 		private void InitializeApplicationControl()
 		{
-			var button = new ActionCenterApplicationButton(application);
+			var button = new ApplicationButton(application);
 
 			application.WindowsChanged += Application_WindowsChanged;
 			button.Clicked += (o, args) => application.Start();
@@ -49,7 +49,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 
 			foreach (var window in windows)
 			{
-				var button = new ActionCenterApplicationButton(application, window);
+				var button = new ApplicationButton(application, window);
 
 				button.Clicked += (o, args) => window.Activate();
 				WindowPanel.Children.Add(button);

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/AudioControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterAudioControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.AudioControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,9 +8,9 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
-                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/AudioControl.xaml.cs

@@ -19,9 +19,9 @@ using SafeExamBrowser.SystemComponents.Contracts.Audio;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterAudioControl : UserControl, ISystemControl
+	internal partial class AudioControl : UserControl, ISystemControl
 	{
 		private readonly IAudio audio;
 		private readonly IText text;
@@ -29,7 +29,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 		private IconResource MutedIcon;
 		private IconResource NoDeviceIcon;
 
-		public ActionCenterAudioControl(IAudio audio, IText text)
+		internal AudioControl(IAudio audio, IText text)
 		{
 			this.audio = audio;
 			this.text = text;

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/Clock.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterClock"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.Clock" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -9,8 +9,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/Clock.xaml.cs

@@ -9,13 +9,13 @@
 using System.Windows.Controls;
 using SafeExamBrowser.UserInterface.Mobile.ViewModels;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterClock : UserControl
+	internal partial class Clock : UserControl
 	{
 		private DateTimeViewModel model;
 
-		public ActionCenterClock()
+		public Clock()
 		{
 			InitializeComponent();
 			InitializeControl();

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutButton.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterKeyboardLayoutButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.KeyboardLayoutButton" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutButton.xaml.cs

@@ -11,25 +11,25 @@ using System.Windows;
 using System.Windows.Controls;
 using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterKeyboardLayoutButton : UserControl
+	internal partial class KeyboardLayoutButton : UserControl
 	{
 		private IKeyboardLayout layout;
 
-		public bool IsCurrent
+		internal bool IsCurrent
 		{
 			set { IsCurrentTextBlock.Visibility = value ? Visibility.Visible : Visibility.Hidden; }
 		}
 
-		public Guid LayoutId
+		internal Guid LayoutId
 		{
 			get { return layout.Id; }
 		}
 
-		public event EventHandler LayoutSelected;
+		internal event EventHandler LayoutSelected;
 
-		public ActionCenterKeyboardLayoutButton(IKeyboardLayout layout)
+		internal KeyboardLayoutButton(IKeyboardLayout layout)
 		{
 			this.layout = layout;
 

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterKeyboardLayoutControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.KeyboardLayoutControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -9,9 +9,9 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
-                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/KeyboardLayoutControl.xaml.cs

@@ -13,14 +13,14 @@ using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterKeyboardLayoutControl : UserControl, ISystemControl
+	internal partial class KeyboardLayoutControl : UserControl, ISystemControl
 	{
 		private IKeyboard keyboard;
 		private IText text;
 
-		public ActionCenterKeyboardLayoutControl(IKeyboard keyboard, IText text)
+		internal KeyboardLayoutControl(IKeyboard keyboard, IText text)
 		{
 			this.keyboard = keyboard;
 			this.text = text;
@@ -57,7 +57,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 		{
 			foreach (var layout in keyboard.GetLayouts())
 			{
-				var button = new ActionCenterKeyboardLayoutButton(layout);
+				var button = new KeyboardLayoutButton(layout);
 
 				button.LayoutSelected += (o, args) => ActivateLayout(layout);
 				LayoutsStackPanel.Children.Add(button);
@@ -81,7 +81,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 
 			foreach (var child in LayoutsStackPanel.Children)
 			{
-				if (child is ActionCenterKeyboardLayoutButton layoutButton)
+				if (child is KeyboardLayoutButton layoutButton)
 				{
 					layoutButton.IsCurrent = layout.Id == layoutButton.LayoutId;
 				}

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NotificationButton.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterNotificationButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.NotificationButton" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/NotificationButton.xaml.cs

@@ -12,13 +12,13 @@ using SafeExamBrowser.Client.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterNotificationButton : UserControl, INotificationControl
+	internal partial class NotificationButton : UserControl, INotificationControl
 	{
 		private INotificationController controller;
 
-		public ActionCenterNotificationButton(INotificationController controller, INotificationInfo info)
+		internal NotificationButton(INotificationController controller, INotificationInfo info)
 		{
 			this.controller = controller;
 

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/PowerSupplyControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterPowerSupplyControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.PowerSupplyControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/PowerSupplyControl.xaml.cs

@@ -14,9 +14,9 @@ using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.SystemComponents.Contracts.PowerSupply;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterPowerSupplyControl : UserControl, ISystemControl
+	internal partial class PowerSupplyControl : UserControl, ISystemControl
 	{
 		private Brush initialBrush;
 		private bool infoShown, warningShown;
@@ -24,7 +24,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 		private IPowerSupply powerSupply;
 		private IText text;
 
-		public ActionCenterPowerSupplyControl(IPowerSupply powerSupply, IText text)
+		internal PowerSupplyControl(IPowerSupply powerSupply, IText text)
 		{
 			this.powerSupply = powerSupply;
 			this.text = text;

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/QuitButton.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterQuitButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.QuitButton" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/QuitButton.xaml.cs

@@ -13,13 +13,13 @@ using SafeExamBrowser.Applications.Contracts.Resources.Icons;
 using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterQuitButton : UserControl
+	internal partial class QuitButton : UserControl
 	{
-		public event QuitButtonClickedEventHandler Clicked;
+		internal event QuitButtonClickedEventHandler Clicked;
 
-		public ActionCenterQuitButton()
+		public QuitButton()
 		{
 			InitializeComponent();
 			InitializeControl();

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkButton.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterWirelessNetworkButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.WirelessNetworkButton" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkButton.xaml.cs

@@ -11,15 +11,15 @@ using System.Windows;
 using System.Windows.Controls;
 using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterWirelessNetworkButton : UserControl
+	internal partial class WirelessNetworkButton : UserControl
 	{
 		private IWirelessNetwork network;
 
-		public event EventHandler NetworkSelected;
+		internal event EventHandler NetworkSelected;
 
-		public ActionCenterWirelessNetworkButton(IWirelessNetwork network)
+		internal WirelessNetworkButton(IWirelessNetwork network)
 		{
 			this.network = network;
 

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenterWirelessNetworkControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter.WirelessNetworkControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -9,9 +9,9 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
-                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/ActionCenter/WirelessNetworkControl.xaml.cs

@@ -18,14 +18,14 @@ using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter
 {
-	public partial class ActionCenterWirelessNetworkControl : UserControl, ISystemControl
+	internal partial class WirelessNetworkControl : UserControl, ISystemControl
 	{
 		private IWirelessAdapter wirelessAdapter;
 		private IText text;
 
-		public ActionCenterWirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text)
+		internal WirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text)
 		{
 			this.wirelessAdapter = wirelessAdapter;
 			this.text = text;
@@ -82,7 +82,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 
 			foreach (var network in wirelessAdapter.GetNetworks())
 			{
-				var button = new ActionCenterWirelessNetworkButton(network);
+				var button = new WirelessNetworkButton(network);
 
 				button.NetworkSelected += (o, args) => wirelessAdapter.Connect(network.Id);
 

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarApplicationControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.ApplicationControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -9,9 +9,9 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
-                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationControl.xaml.cs

@@ -17,14 +17,14 @@ using SafeExamBrowser.Applications.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarApplicationControl : UserControl, IApplicationControl
+	internal partial class ApplicationControl : UserControl, IApplicationControl
 	{
 		private IApplication application;
 		private IApplicationWindow single;
 
-		public TaskbarApplicationControl(IApplication application)
+		internal ApplicationControl(IApplication application)
 		{
 			this.application = application;
 
@@ -92,7 +92,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 
 			foreach (var window in windows)
 			{
-				WindowStackPanel.Children.Add(new TaskbarApplicationWindowButton(window));
+				WindowStackPanel.Children.Add(new ApplicationWindowButton(window));
 			}
 
 			if (WindowStackPanel.Children.Count == 1)

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationWindowButton.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarApplicationWindowButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.ApplicationWindowButton" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/ApplicationWindowButton.xaml.cs

@@ -12,13 +12,13 @@ using SafeExamBrowser.Applications.Contracts;
 using SafeExamBrowser.Applications.Contracts.Resources.Icons;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarApplicationWindowButton : UserControl
+	internal partial class ApplicationWindowButton : UserControl
 	{
 		private IApplicationWindow window;
 
-		public TaskbarApplicationWindowButton(IApplicationWindow window)
+		internal ApplicationWindowButton(IApplicationWindow window)
 		{
 			this.window = window;
 

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/AudioControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarAudioControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.AudioControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -9,9 +9,9 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
-                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/AudioControl.xaml.cs

@@ -18,9 +18,9 @@ using SafeExamBrowser.SystemComponents.Contracts.Audio;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarAudioControl : UserControl, ISystemControl
+	internal partial class AudioControl : UserControl, ISystemControl
 	{
 		private readonly IAudio audio;
 		private readonly IText text;
@@ -28,7 +28,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 		private IconResource MutedIcon;
 		private IconResource NoDeviceIcon;
 
-		public TaskbarAudioControl(IAudio audio, IText text)
+		internal AudioControl(IAudio audio, IText text)
 		{
 			this.audio = audio;
 			this.text = text;

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/Clock.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarClock"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.Clock" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/Clock.xaml.cs

@@ -9,13 +9,13 @@
 using System.Windows.Controls;
 using SafeExamBrowser.UserInterface.Mobile.ViewModels;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarClock : UserControl
+	internal partial class Clock : UserControl
 	{
 		private DateTimeViewModel model;
 
-		public TaskbarClock()
+		public Clock()
 		{
 			InitializeComponent();
 			InitializeControl();

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutButton.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarKeyboardLayoutButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.KeyboardLayoutButton" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutButton.xaml.cs

@@ -11,25 +11,25 @@ using System.Windows;
 using System.Windows.Controls;
 using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarKeyboardLayoutButton : UserControl
+	internal partial class KeyboardLayoutButton : UserControl
 	{
 		private IKeyboardLayout layout;
 
-		public bool IsCurrent
+		internal bool IsCurrent
 		{
 			set { IsCurrentTextBlock.Visibility = value ? Visibility.Visible : Visibility.Hidden; }
 		}
 
-		public Guid LayoutId
+		internal Guid LayoutId
 		{
 			get { return layout.Id; }
 		}
 
-		public event EventHandler LayoutSelected;
+		internal event EventHandler LayoutSelected;
 
-		public TaskbarKeyboardLayoutButton(IKeyboardLayout layout)
+		internal KeyboardLayoutButton(IKeyboardLayout layout)
 		{
 			this.layout = layout;
 

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarKeyboardLayoutControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.KeyboardLayoutControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -9,9 +9,9 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
-                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/KeyboardLayoutControl.xaml.cs

@@ -17,14 +17,14 @@ using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.SystemComponents.Contracts.Keyboard;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarKeyboardLayoutControl : UserControl, ISystemControl
+	internal partial class KeyboardLayoutControl : UserControl, ISystemControl
 	{
 		private IKeyboard keyboard;
 		private IText text;
 
-		public TaskbarKeyboardLayoutControl(IKeyboard keyboard, IText text)
+		internal KeyboardLayoutControl(IKeyboard keyboard, IText text)
 		{
 			this.keyboard = keyboard;
 			this.text = text;
@@ -80,7 +80,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 		{
 			foreach (var layout in keyboard.GetLayouts())
 			{
-				var button = new TaskbarKeyboardLayoutButton(layout);
+				var button = new KeyboardLayoutButton(layout);
 
 				button.LayoutSelected += (o, args) => ActivateLayout(layout);
 				LayoutsStackPanel.Children.Add(button);
@@ -105,7 +105,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 
 			foreach (var child in LayoutsStackPanel.Children)
 			{
-				if (child is TaskbarKeyboardLayoutButton layoutButton)
+				if (child is KeyboardLayoutButton layoutButton)
 				{
 					layoutButton.IsCurrent = layout.Id == layoutButton.LayoutId;
 				}

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NotificationButton.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarNotificationButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.NotificationButton" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/NotificationButton.xaml.cs

@@ -12,13 +12,13 @@ using SafeExamBrowser.Client.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarNotificationButton : UserControl, INotificationControl
+	internal partial class NotificationButton : UserControl, INotificationControl
 	{
 		private INotificationController controller;
 
-		public TaskbarNotificationButton(INotificationController controller, INotificationInfo info)
+		internal NotificationButton(INotificationController controller, INotificationInfo info)
 		{
 			this.controller = controller;
 

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/PowerSupplyControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarPowerSupplyControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.PowerSupplyControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/PowerSupplyControl.xaml.cs

@@ -16,9 +16,9 @@ using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.SystemComponents.Contracts.PowerSupply;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarPowerSupplyControl : UserControl, ISystemControl
+	internal partial class PowerSupplyControl : UserControl, ISystemControl
 	{
 		private Brush initialBrush;
 		private bool infoShown, warningShown;
@@ -26,7 +26,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 		private IPowerSupply powerSupply;
 		private IText text;
 
-		public TaskbarPowerSupplyControl(IPowerSupply powerSupply, IText text)
+		internal PowerSupplyControl(IPowerSupply powerSupply, IText text)
 		{
 			this.powerSupply = powerSupply;
 			this.text = text;

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/QuitButton.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarQuitButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.QuitButton" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/QuitButton.xaml.cs

@@ -14,13 +14,13 @@ using SafeExamBrowser.Applications.Contracts.Resources.Icons;
 using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarQuitButton : UserControl
+	internal partial class QuitButton : UserControl
 	{
-		public event QuitButtonClickedEventHandler Clicked;
+		internal event QuitButtonClickedEventHandler Clicked;
 
-		public TaskbarQuitButton()
+		public QuitButton()
 		{
 			InitializeComponent();
 			LoadIcon();

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkButton.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarWirelessNetworkButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.WirelessNetworkButton" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,8 +8,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkButton.xaml.cs

@@ -11,15 +11,15 @@ using System.Windows;
 using System.Windows.Controls;
 using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarWirelessNetworkButton : UserControl
+	internal partial class WirelessNetworkButton : UserControl
 	{
 		private IWirelessNetwork network;
 
-		public event EventHandler NetworkSelected;
+		internal event EventHandler NetworkSelected;
 
-		public TaskbarWirelessNetworkButton(IWirelessNetwork network)
+		internal WirelessNetworkButton(IWirelessNetwork network)
 		{
 			this.network = network;
 

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskbarWirelessNetworkControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar.WirelessNetworkControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -10,9 +10,9 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
-                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskbar/WirelessNetworkControl.xaml.cs

@@ -19,14 +19,14 @@ using SafeExamBrowser.SystemComponents.Contracts.WirelessNetwork;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar
 {
-	public partial class TaskbarWirelessNetworkControl : UserControl, ISystemControl
+	internal partial class WirelessNetworkControl : UserControl, ISystemControl
 	{
 		private IWirelessAdapter wirelessAdapter;
 		private IText text;
 
-		public TaskbarWirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text)
+		internal WirelessNetworkControl(IWirelessAdapter wirelessAdapter, IText text)
 		{
 			this.wirelessAdapter = wirelessAdapter;
 			this.text = text;
@@ -102,7 +102,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls
 
 			foreach (var network in wirelessAdapter.GetNetworks())
 			{
-				var button = new TaskbarWirelessNetworkButton(network);
+				var button = new WirelessNetworkButton(network);
 
 				button.NetworkSelected += (o, args) => wirelessAdapter.Connect(network.Id);
 

SafeExamBrowser.UserInterface.Mobile/Controls/Taskview/WindowControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.TaskviewWindowControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Mobile.Controls.Taskview.WindowControl" x:ClassModifier="internal"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -8,7 +8,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="../Templates/Colors.xaml" />
+                <ResourceDictionary Source="../../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>

SafeExamBrowser.UserInterface.Mobile/Controls/Taskview/WindowControl.xaml.cs

@@ -13,15 +13,15 @@ using SafeExamBrowser.Applications.Contracts;
 using SafeExamBrowser.Applications.Contracts.Resources.Icons;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile.Controls
+namespace SafeExamBrowser.UserInterface.Mobile.Controls.Taskview
 {
-	public partial class TaskviewWindowControl : UserControl
+	internal partial class WindowControl : UserControl
 	{
-		private Taskview taskview;
+		private Windows.Taskview taskview;
 		private IntPtr thumbnail;
 		private IApplicationWindow window;
 
-		public TaskviewWindowControl(IApplicationWindow window, Taskview taskview)
+		internal WindowControl(IApplicationWindow window, Windows.Taskview taskview)
 		{
 			this.window = window;
 			this.taskview = taskview;

SafeExamBrowser.UserInterface.Mobile/FileSystemDialogFactory.cs

@@ -10,6 +10,7 @@ using System.Windows;
 using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog;
 using SafeExamBrowser.UserInterface.Contracts.Windows;
+using SafeExamBrowser.UserInterface.Mobile.Windows;
 
 namespace SafeExamBrowser.UserInterface.Mobile
 {

SafeExamBrowser.UserInterface.Mobile/MessageBox.cs

@@ -10,6 +10,7 @@ using System.Windows;
 using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.MessageBox;
 using SafeExamBrowser.UserInterface.Contracts.Windows;
+using SafeExamBrowser.UserInterface.Mobile.Windows;
 using MessageBoxResult = SafeExamBrowser.UserInterface.Contracts.MessageBox.MessageBoxResult;
 
 namespace SafeExamBrowser.UserInterface.Mobile

SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj

@@ -68,117 +68,117 @@
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AboutWindow.xaml.cs">
+    <Compile Include="Windows\AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ActionCenter.xaml.cs">
+    <Compile Include="Windows\ActionCenter.xaml.cs">
       <DependentUpon>ActionCenter.xaml</DependentUpon>
     </Compile>
-    <Compile Include="BrowserWindow.xaml.cs">
+    <Compile Include="Windows\BrowserWindow.xaml.cs">
       <DependentUpon>BrowserWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterApplicationButton.xaml.cs">
+    <Compile Include="Controls\ActionCenter\ApplicationButton.xaml.cs">
-      <DependentUpon>ActionCenterApplicationButton.xaml</DependentUpon>
+      <DependentUpon>ApplicationButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterApplicationControl.xaml.cs">
+    <Compile Include="Controls\ActionCenter\ApplicationControl.xaml.cs">
-      <DependentUpon>ActionCenterApplicationControl.xaml</DependentUpon>
+      <DependentUpon>ApplicationControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterAudioControl.xaml.cs">
+    <Compile Include="Controls\ActionCenter\AudioControl.xaml.cs">
-      <DependentUpon>ActionCenterAudioControl.xaml</DependentUpon>
+      <DependentUpon>AudioControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterClock.xaml.cs">
+    <Compile Include="Controls\ActionCenter\Clock.xaml.cs">
-      <DependentUpon>ActionCenterClock.xaml</DependentUpon>
+      <DependentUpon>Clock.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterKeyboardLayoutButton.xaml.cs">
+    <Compile Include="Controls\ActionCenter\KeyboardLayoutButton.xaml.cs">
-      <DependentUpon>ActionCenterKeyboardLayoutButton.xaml</DependentUpon>
+      <DependentUpon>KeyboardLayoutButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterKeyboardLayoutControl.xaml.cs">
+    <Compile Include="Controls\ActionCenter\KeyboardLayoutControl.xaml.cs">
-      <DependentUpon>ActionCenterKeyboardLayoutControl.xaml</DependentUpon>
+      <DependentUpon>KeyboardLayoutControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterNotificationButton.xaml.cs">
+    <Compile Include="Controls\ActionCenter\NotificationButton.xaml.cs">
-      <DependentUpon>ActionCenterNotificationButton.xaml</DependentUpon>
+      <DependentUpon>NotificationButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterPowerSupplyControl.xaml.cs">
+    <Compile Include="Controls\ActionCenter\PowerSupplyControl.xaml.cs">
-      <DependentUpon>ActionCenterPowerSupplyControl.xaml</DependentUpon>
+      <DependentUpon>PowerSupplyControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterQuitButton.xaml.cs">
+    <Compile Include="Controls\ActionCenter\QuitButton.xaml.cs">
-      <DependentUpon>ActionCenterQuitButton.xaml</DependentUpon>
+      <DependentUpon>QuitButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterWirelessNetworkButton.xaml.cs">
+    <Compile Include="Controls\ActionCenter\WirelessNetworkButton.xaml.cs">
-      <DependentUpon>ActionCenterWirelessNetworkButton.xaml</DependentUpon>
+      <DependentUpon>WirelessNetworkButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ActionCenterWirelessNetworkControl.xaml.cs">
+    <Compile Include="Controls\ActionCenter\WirelessNetworkControl.xaml.cs">
-      <DependentUpon>ActionCenterWirelessNetworkControl.xaml</DependentUpon>
+      <DependentUpon>WirelessNetworkControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\Browser\DownloadItemControl.xaml.cs">
       <DependentUpon>DownloadItemControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarApplicationControl.xaml.cs">
+    <Compile Include="Controls\Taskbar\ApplicationControl.xaml.cs">
-      <DependentUpon>TaskbarApplicationControl.xaml</DependentUpon>
+      <DependentUpon>ApplicationControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarApplicationWindowButton.xaml.cs">
+    <Compile Include="Controls\Taskbar\ApplicationWindowButton.xaml.cs">
-      <DependentUpon>TaskbarApplicationWindowButton.xaml</DependentUpon>
+      <DependentUpon>ApplicationWindowButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarAudioControl.xaml.cs">
+    <Compile Include="Controls\Taskbar\AudioControl.xaml.cs">
-      <DependentUpon>TaskbarAudioControl.xaml</DependentUpon>
+      <DependentUpon>AudioControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarClock.xaml.cs">
+    <Compile Include="Controls\Taskbar\Clock.xaml.cs">
-      <DependentUpon>TaskbarClock.xaml</DependentUpon>
+      <DependentUpon>Clock.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarKeyboardLayoutButton.xaml.cs">
+    <Compile Include="Controls\Taskbar\KeyboardLayoutButton.xaml.cs">
-      <DependentUpon>TaskbarKeyboardLayoutButton.xaml</DependentUpon>
+      <DependentUpon>KeyboardLayoutButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarKeyboardLayoutControl.xaml.cs">
+    <Compile Include="Controls\Taskbar\KeyboardLayoutControl.xaml.cs">
-      <DependentUpon>TaskbarKeyboardLayoutControl.xaml</DependentUpon>
+      <DependentUpon>KeyboardLayoutControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarNotificationButton.xaml.cs">
+    <Compile Include="Controls\Taskbar\NotificationButton.xaml.cs">
-      <DependentUpon>TaskbarNotificationButton.xaml</DependentUpon>
+      <DependentUpon>NotificationButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarPowerSupplyControl.xaml.cs">
+    <Compile Include="Controls\Taskbar\PowerSupplyControl.xaml.cs">
-      <DependentUpon>TaskbarPowerSupplyControl.xaml</DependentUpon>
+      <DependentUpon>PowerSupplyControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarQuitButton.xaml.cs">
+    <Compile Include="Controls\Taskbar\QuitButton.xaml.cs">
-      <DependentUpon>TaskbarQuitButton.xaml</DependentUpon>
+      <DependentUpon>QuitButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarWirelessNetworkButton.xaml.cs">
+    <Compile Include="Controls\Taskbar\WirelessNetworkButton.xaml.cs">
-      <DependentUpon>TaskbarWirelessNetworkButton.xaml</DependentUpon>
+      <DependentUpon>WirelessNetworkButton.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskbarWirelessNetworkControl.xaml.cs">
+    <Compile Include="Controls\Taskbar\WirelessNetworkControl.xaml.cs">
-      <DependentUpon>TaskbarWirelessNetworkControl.xaml</DependentUpon>
+      <DependentUpon>WirelessNetworkControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\TaskviewWindowControl.xaml.cs">
+    <Compile Include="Controls\Taskview\WindowControl.xaml.cs">
-      <DependentUpon>TaskviewWindowControl.xaml</DependentUpon>
+      <DependentUpon>WindowControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="FileSystemDialog.xaml.cs">
+    <Compile Include="Windows\FileSystemDialog.xaml.cs">
       <DependentUpon>FileSystemDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="FileSystemDialogFactory.cs" />
-    <Compile Include="LockScreen.xaml.cs">
+    <Compile Include="Windows\LockScreen.xaml.cs">
       <DependentUpon>LockScreen.xaml</DependentUpon>
     </Compile>
-    <Compile Include="LogWindow.xaml.cs">
+    <Compile Include="Windows\LogWindow.xaml.cs">
       <DependentUpon>LogWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="MessageBox.cs" />
-    <Compile Include="MessageBoxDialog.xaml.cs">
+    <Compile Include="Windows\MessageBoxDialog.xaml.cs">
       <DependentUpon>MessageBoxDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PasswordDialog.xaml.cs">
+    <Compile Include="Windows\PasswordDialog.xaml.cs">
       <DependentUpon>PasswordDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RuntimeWindow.xaml.cs">
+    <Compile Include="Windows\RuntimeWindow.xaml.cs">
       <DependentUpon>RuntimeWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SplashScreen.xaml.cs">
+    <Compile Include="Windows\SplashScreen.xaml.cs">
       <DependentUpon>SplashScreen.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Taskbar.xaml.cs">
+    <Compile Include="Windows\Taskbar.xaml.cs">
       <DependentUpon>Taskbar.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Taskview.xaml.cs">
+    <Compile Include="Windows\Taskview.xaml.cs">
       <DependentUpon>Taskview.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserInterfaceFactory.cs" />
@@ -226,59 +226,59 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="AboutWindow.xaml">
+    <Page Include="Windows\AboutWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="ActionCenter.xaml">
+    <Page Include="Windows\ActionCenter.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="BrowserWindow.xaml">
+    <Page Include="Windows\BrowserWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\ActionCenterApplicationButton.xaml">
+    <Page Include="Controls\ActionCenter\ApplicationButton.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\ActionCenterApplicationControl.xaml">
+    <Page Include="Controls\ActionCenter\ApplicationControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\ActionCenterAudioControl.xaml">
+    <Page Include="Controls\ActionCenter\AudioControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\ActionCenterClock.xaml">
+    <Page Include="Controls\ActionCenter\Clock.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\ActionCenterKeyboardLayoutButton.xaml">
+    <Page Include="Controls\ActionCenter\KeyboardLayoutButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\ActionCenterKeyboardLayoutControl.xaml">
+    <Page Include="Controls\ActionCenter\KeyboardLayoutControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\ActionCenterNotificationButton.xaml">
+    <Page Include="Controls\ActionCenter\NotificationButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\ActionCenterPowerSupplyControl.xaml">
+    <Page Include="Controls\ActionCenter\PowerSupplyControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\ActionCenterQuitButton.xaml">
+    <Page Include="Controls\ActionCenter\QuitButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\ActionCenterWirelessNetworkButton.xaml">
+    <Page Include="Controls\ActionCenter\WirelessNetworkButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\ActionCenterWirelessNetworkControl.xaml">
+    <Page Include="Controls\ActionCenter\WirelessNetworkControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -286,47 +286,47 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarApplicationControl.xaml">
+    <Page Include="Controls\Taskbar\ApplicationControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarApplicationWindowButton.xaml">
+    <Page Include="Controls\Taskbar\ApplicationWindowButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarAudioControl.xaml">
+    <Page Include="Controls\Taskbar\AudioControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarClock.xaml">
+    <Page Include="Controls\Taskbar\Clock.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarKeyboardLayoutButton.xaml">
+    <Page Include="Controls\Taskbar\KeyboardLayoutButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarKeyboardLayoutControl.xaml">
+    <Page Include="Controls\Taskbar\KeyboardLayoutControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarNotificationButton.xaml">
+    <Page Include="Controls\Taskbar\NotificationButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarPowerSupplyControl.xaml">
+    <Page Include="Controls\Taskbar\PowerSupplyControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarQuitButton.xaml">
+    <Page Include="Controls\Taskbar\QuitButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarWirelessNetworkButton.xaml">
+    <Page Include="Controls\Taskbar\WirelessNetworkButton.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Controls\TaskbarWirelessNetworkControl.xaml">
+    <Page Include="Controls\Taskbar\WirelessNetworkControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -366,11 +366,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Resource>
-    <Page Include="Controls\TaskviewWindowControl.xaml">
+    <Page Include="Controls\Taskview\WindowControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="FileSystemDialog.xaml">
+    <Page Include="Windows\FileSystemDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -450,35 +450,35 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="LockScreen.xaml">
+    <Page Include="Windows\LockScreen.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="LogWindow.xaml">
+    <Page Include="Windows\LogWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="MessageBoxDialog.xaml">
+    <Page Include="Windows\MessageBoxDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PasswordDialog.xaml">
+    <Page Include="Windows\PasswordDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="RuntimeWindow.xaml">
+    <Page Include="Windows\RuntimeWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="SplashScreen.xaml">
+    <Page Include="Windows\SplashScreen.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Taskbar.xaml">
+    <Page Include="Windows\Taskbar.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Taskview.xaml">
+    <Page Include="Windows\Taskview.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

SafeExamBrowser.UserInterface.Mobile/UserInterfaceFactory.cs

@@ -26,7 +26,8 @@ using SafeExamBrowser.UserInterface.Contracts.Browser;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 using SafeExamBrowser.UserInterface.Contracts.Windows;
 using SafeExamBrowser.UserInterface.Contracts.Windows.Data;
-using SafeExamBrowser.UserInterface.Mobile.Controls;
+using SafeExamBrowser.UserInterface.Mobile.Windows;
+using SplashScreen = SafeExamBrowser.UserInterface.Mobile.Windows.SplashScreen;
 
 namespace SafeExamBrowser.UserInterface.Mobile
 {
@@ -50,11 +51,11 @@ namespace SafeExamBrowser.UserInterface.Mobile
 		{
 			if (location == Location.ActionCenter)
 			{
-				return new ActionCenterApplicationControl(application);
+				return new Controls.ActionCenter.ApplicationControl(application);
 			}
 			else
 			{
-				return new TaskbarApplicationControl(application);
+				return new Controls.Taskbar.ApplicationControl(application);
 			}
 		}
 
@@ -62,11 +63,11 @@ namespace SafeExamBrowser.UserInterface.Mobile
 		{
 			if (location == Location.ActionCenter)
 			{
-				return new ActionCenterAudioControl(audio, text);
+				return new Controls.ActionCenter.AudioControl(audio, text);
 			}
 			else
 			{
-				return new TaskbarAudioControl(audio, text);
+				return new Controls.Taskbar.AudioControl(audio, text);
 			}
 		}
 
@@ -79,11 +80,11 @@ namespace SafeExamBrowser.UserInterface.Mobile
 		{
 			if (location == Location.ActionCenter)
 			{
-				return new ActionCenterKeyboardLayoutControl(keyboard, text);
+				return new Controls.ActionCenter.KeyboardLayoutControl(keyboard, text);
 			}
 			else
 			{
-				return new TaskbarKeyboardLayoutControl(keyboard, text);
+				return new Controls.Taskbar.KeyboardLayoutControl(keyboard, text);
 			}
 		}
 
@@ -120,11 +121,11 @@ namespace SafeExamBrowser.UserInterface.Mobile
 		{
 			if (location == Location.ActionCenter)
 			{
-				return new ActionCenterNotificationButton(controller, info);
+				return new Controls.ActionCenter.NotificationButton(controller, info);
 			}
 			else
 			{
-				return new TaskbarNotificationButton(controller, info);
+				return new Controls.Taskbar.NotificationButton(controller, info);
 			}
 		}
 
@@ -142,11 +143,11 @@ namespace SafeExamBrowser.UserInterface.Mobile
 		{
 			if (location == Location.ActionCenter)
 			{
-				return new ActionCenterPowerSupplyControl(powerSupply, text);
+				return new Controls.ActionCenter.PowerSupplyControl(powerSupply, text);
 			}
 			else
 			{
-				return new TaskbarPowerSupplyControl(powerSupply, text);
+				return new Controls.Taskbar.PowerSupplyControl(powerSupply, text);
 			}
 		}
 
@@ -183,11 +184,11 @@ namespace SafeExamBrowser.UserInterface.Mobile
 		{
 			if (location == Location.ActionCenter)
 			{
-				return new ActionCenterWirelessNetworkControl(wirelessAdapter, text);
+				return new Controls.ActionCenter.WirelessNetworkControl(wirelessAdapter, text);
 			}
 			else
 			{
-				return new TaskbarWirelessNetworkControl(wirelessAdapter, text);
+				return new Controls.Taskbar.WirelessNetworkControl(wirelessAdapter, text);
 			}
 		}
 

SafeExamBrowser.UserInterface.Mobile/Windows/AboutWindow.xaml

@@ -1,15 +1,15 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.AboutWindow"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.AboutWindow" x:ClassModifier="internal"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile"
-        mc:Ignorable="d" Background="White" Height="450" Width="675" ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico" FontSize="16"
+        mc:Ignorable="d" Background="White" Height="450" Width="675" ResizeMode="NoResize" Icon="../Images/SafeExamBrowser.ico" FontSize="16"
         ShowInTaskbar="False" WindowStartupLocation="CenterScreen">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="./Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

SafeExamBrowser.UserInterface.Mobile/Windows/AboutWindow.xaml.cs

@@ -14,9 +14,9 @@ using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.Windows;
 using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
-	public partial class AboutWindow : Window, IWindow
+	internal partial class AboutWindow : Window, IWindow
 	{
 		private AppConfig appConfig;
 		private IText text;
@@ -28,7 +28,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 			remove { closing -= value; }
 		}
 
-		public AboutWindow(AppConfig appConfig, IText text)
+		internal AboutWindow(AppConfig appConfig, IText text)
 		{
 			this.appConfig = appConfig;
 			this.text = text;

SafeExamBrowser.UserInterface.Mobile/Windows/ActionCenter.xaml

@@ -1,16 +1,16 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.ActionCenter"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.ActionCenter"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile.Controls"
+        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile.Controls.ActionCenter"
         mc:Ignorable="d" Title="ActionCenter" Height="1000" Width="400" Background="{DynamicResource BackgroundTransparentBrush}"
         AllowsTransparency="True" FontSize="16" WindowStyle="None" Topmost="True" ResizeMode="NoResize">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="./Templates/Colors.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
-                <ResourceDictionary Source="./Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
@@ -23,8 +23,8 @@
             <StackPanel x:Name="ApplicationPanel" Orientation="Vertical" />
         </ScrollViewer>
         <UniformGrid x:Name="ControlPanel" Grid.Row="1" Columns="3" Margin="10">
-            <local:ActionCenterClock x:Name="Clock" />
+            <local:Clock x:Name="Clock" />
-            <local:ActionCenterQuitButton x:Name="QuitButton" />
+            <local:QuitButton x:Name="QuitButton" />
         </UniformGrid>
     </Grid>
 </Window>

SafeExamBrowser.UserInterface.Mobile/Windows/ActionCenter.xaml.cs

@@ -13,7 +13,7 @@ using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
 using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
 	public partial class ActionCenter : Window, IActionCenter
 	{

SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml

@@ -1,17 +1,17 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.BrowserWindow"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.BrowserWindow" x:ClassModifier="internal"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:fa="http://schemas.fontawesome.io/icons/"
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile.Controls"
-        mc:Ignorable="d" Title="BrowserWindow" Background="#FFF0F0F0" FontSize="16" Height="500" Width="750" MinHeight="250" MinWidth="250" Icon=".\Images\SafeExamBrowser.ico">
+        mc:Ignorable="d" Title="BrowserWindow" Background="#FFF0F0F0" FontSize="16" Height="500" Width="750" MinHeight="250" MinWidth="250" Icon="../Images/SafeExamBrowser.ico">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="./Templates/Buttons.xaml" />
+                <ResourceDictionary Source="../Templates/Buttons.xaml" />
-                <ResourceDictionary Source="./Templates/Colors.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
-                <ResourceDictionary Source="./Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs

@@ -26,9 +26,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
 using SafeExamBrowser.UserInterface.Mobile.Controls.Browser;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
-	public partial class BrowserWindow : Window, IBrowserWindow
+	internal partial class BrowserWindow : Window, IBrowserWindow
 	{
 		private bool isMainWindow;
 		private BrowserSettings settings;
@@ -59,7 +59,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 			remove { closing -= value; }
 		}
 
-		public BrowserWindow(IBrowserControl browserControl, BrowserSettings settings, bool isMainWindow, IText text)
+		internal BrowserWindow(IBrowserControl browserControl, BrowserSettings settings, bool isMainWindow, IText text)
 		{
 			this.isMainWindow = isMainWindow;
 			this.settings = settings;

SafeExamBrowser.UserInterface.Mobile/Windows/FileSystemDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.FileSystemDialog"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.FileSystemDialog" x:ClassModifier="internal"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -9,7 +9,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="./Templates/Colors.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

SafeExamBrowser.UserInterface.Mobile/Windows/FileSystemDialog.xaml.cs

@@ -20,9 +20,9 @@ using SafeExamBrowser.UserInterface.Contracts.FileSystemDialog;
 using SafeExamBrowser.UserInterface.Contracts.Windows;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
-	public partial class FileSystemDialog : Window
+	internal partial class FileSystemDialog : Window
 	{
 		private FileSystemElement element;
 		private string initialPath;
@@ -32,7 +32,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 		private string title;
 		private IWindow parent;
 
-		public FileSystemDialog(
+		internal FileSystemDialog(
 			FileSystemElement element,
 			FileSystemOperation operation,
 			IText text,

SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.LockScreen"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.LockScreen" x:ClassModifier="internal"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -19,7 +19,7 @@
             </Grid.ColumnDefinitions>
             <StackPanel Grid.Column="1" Orientation="Vertical">
                 <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="0,10">
-                    <Image Height="100" Margin="0,0,20,0" Source="./Images/SafeExamBrowser.ico" />
+                    <Image Height="100" Margin="0,0,20,0" Source="../Images/SafeExamBrowser.ico" />
                     <TextBlock Name="Heading" Foreground="White" FontSize="75" FontWeight="ExtraBold" TextAlignment="Center" Text="SEB LOCKED" />
                 </StackPanel>
                 <TextBlock Name="Message" Foreground="White" FontSize="24" FontWeight="DemiBold" Margin="0,10" Padding="5" TextWrapping="Wrap" />

SafeExamBrowser.UserInterface.Mobile/Windows/LockScreen.xaml.cs

@@ -21,9 +21,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 using Screen = System.Windows.Forms.Screen;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
-	public partial class LockScreen : Window, ILockScreen
+	internal partial class LockScreen : Window, ILockScreen
 	{
 		private AutoResetEvent autoResetEvent;
 		private IList<Window> windows;
@@ -35,7 +35,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 			remove { throw new NotImplementedException(); }
 		}
 
-		public LockScreen(string message, string title, IText text, IEnumerable<LockScreenOption> options)
+		internal LockScreen(string message, string title, IText text, IEnumerable<LockScreenOption> options)
 		{
 			this.autoResetEvent = new AutoResetEvent(false);
 			this.text = text;

SafeExamBrowser.UserInterface.Mobile/Windows/LogWindow.xaml

@@ -1,15 +1,15 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.LogWindow"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.LogWindow" x:ClassModifier="internal"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile"
         mc:Ignorable="d" Title="{Binding Path=WindowTitle}" Background="Black" Foreground="White" Height="750" Width="1000" MinHeight="350"
-        MinWidth="350" Topmost="True" WindowState="Maximized" WindowStartupLocation="CenterScreen" Icon="./Images/LogNotification.ico">
+        MinWidth="350" Topmost="True" WindowState="Maximized" WindowStartupLocation="CenterScreen" Icon="../Images/LogNotification.ico">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="./Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

SafeExamBrowser.UserInterface.Mobile/Windows/LogWindow.xaml.cs

@@ -15,9 +15,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows;
 using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
 using SafeExamBrowser.UserInterface.Mobile.ViewModels;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
-	public partial class LogWindow : Window, IWindow
+	internal partial class LogWindow : Window, IWindow
 	{
 		private ILogger logger;
 		private LogViewModel model;
@@ -29,7 +29,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 			remove { closing -= value; }
 		}
 
-		public LogWindow(ILogger logger, IText text)
+		internal LogWindow(ILogger logger, IText text)
 		{
 			InitializeComponent();
 

SafeExamBrowser.UserInterface.Mobile/Windows/MessageBoxDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.MessageBoxDialog"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.MessageBoxDialog" x:ClassModifier="internal"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -9,7 +9,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="./Templates/Colors.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

SafeExamBrowser.UserInterface.Mobile/Windows/MessageBoxDialog.xaml.cs

@@ -16,9 +16,9 @@ using SafeExamBrowser.I18n.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.MessageBox;
 using MessageBoxResult = SafeExamBrowser.UserInterface.Contracts.MessageBox.MessageBoxResult;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
-	public partial class MessageBoxDialog : Window
+	internal partial class MessageBoxDialog : Window
 	{
 		private readonly IText text;
 
@@ -30,7 +30,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 			InitializeMessageBox();
 		}
 
-		public MessageBoxResult Show(string message, string title, MessageBoxAction action, MessageBoxIcon icon, Window parent = null)
+		internal MessageBoxResult Show(string message, string title, MessageBoxAction action, MessageBoxIcon icon, Window parent = null)
 		{
 			Message.Text = message;
 			Title = title;

SafeExamBrowser.UserInterface.Mobile/Windows/PasswordDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.PasswordDialog"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.PasswordDialog" x:ClassModifier="internal"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -9,7 +9,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="./Templates/Colors.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

SafeExamBrowser.UserInterface.Mobile/Windows/PasswordDialog.xaml.cs

@@ -13,9 +13,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows;
 using SafeExamBrowser.UserInterface.Contracts.Windows.Data;
 using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
-	public partial class PasswordDialog : Window, IPasswordDialog
+	internal partial class PasswordDialog : Window, IPasswordDialog
 	{
 		private IText text;
 		private WindowClosingEventHandler closing;
@@ -26,7 +26,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 			remove { closing -= value; }
 		}
 
-		public PasswordDialog(string message, string title, IText text)
+		internal PasswordDialog(string message, string title, IText text)
 		{
 			this.text = text;
 

SafeExamBrowser.UserInterface.Mobile/Windows/RuntimeWindow.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.RuntimeWindow"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.RuntimeWindow" x:ClassModifier="internal"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -6,11 +6,11 @@
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile"
         xmlns:s="clr-namespace:System;assembly=mscorlib"
         mc:Ignorable="d" Background="White" Foreground="Black" Height="500" Width="850" WindowStyle="None" WindowStartupLocation="CenterScreen"
-        Icon="./Images/SafeExamBrowser.ico" ResizeMode="NoResize" Title="Safe Exam Browser" Topmost="True">
+        Icon="../Images/SafeExamBrowser.ico" ResizeMode="NoResize" Title="Safe Exam Browser" Topmost="True">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="./Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

SafeExamBrowser.UserInterface.Mobile/Windows/RuntimeWindow.xaml.cs

@@ -16,9 +16,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows;
 using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
 using SafeExamBrowser.UserInterface.Mobile.ViewModels;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
-	public partial class RuntimeWindow : Window, IRuntimeWindow
+	internal partial class RuntimeWindow : Window, IRuntimeWindow
 	{
 		private bool allowClose;
 		private AppConfig appConfig;
@@ -31,7 +31,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 			set => Dispatcher.Invoke(() => LogScrollViewer.Visibility = value ? Visibility.Visible : Visibility.Collapsed);
 		}
 
-		bool IRuntimeWindow.ShowProgressBar
+		public bool ShowProgressBar
 		{
 			set
 			{
@@ -54,7 +54,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 			remove { closing -= value; }
 		}
 
-		public RuntimeWindow(AppConfig appConfig, IText text)
+		internal RuntimeWindow(AppConfig appConfig, IText text)
 		{
 			this.appConfig = appConfig;
 			this.text = text;

SafeExamBrowser.UserInterface.Mobile/Windows/SplashScreen.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.SplashScreen"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.SplashScreen" x:ClassModifier="internal"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile"
         mc:Ignorable="d"
         Title="SplashScreen" Background="White" FontSize="16" Height="300" Width="500" WindowStyle="None" WindowStartupLocation="CenterScreen"
-        Cursor="Wait" Icon="./Images/SafeExamBrowser.ico" ResizeMode="NoResize" Topmost="True">
+        Cursor="Wait" Icon="../Images/SafeExamBrowser.ico" ResizeMode="NoResize" Topmost="True">
     <Border BorderBrush="DodgerBlue" BorderThickness="1">
         <Grid>
             <Grid.RowDefinitions>

SafeExamBrowser.UserInterface.Mobile/Windows/SplashScreen.xaml.cs

@@ -15,9 +15,9 @@ using SafeExamBrowser.UserInterface.Contracts.Windows;
 using SafeExamBrowser.UserInterface.Contracts.Windows.Events;
 using SafeExamBrowser.UserInterface.Mobile.ViewModels;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
-	public partial class SplashScreen : Window, ISplashScreen
+	internal partial class SplashScreen : Window, ISplashScreen
 	{
 		private bool allowClose;
 		private ProgressIndicatorViewModel model = new ProgressIndicatorViewModel();
@@ -43,7 +43,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 			remove { closing -= value; }
 		}
 
-		public SplashScreen(IText text, AppConfig appConfig = null)
+		internal SplashScreen(IText text, AppConfig appConfig = null)
 		{
 			this.appConfig = appConfig;
 			this.text = text;

SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml

@@ -1,17 +1,17 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Taskbar"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.Taskbar"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile.Controls"
+        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile.Controls.Taskbar"
         xmlns:s="clr-namespace:System;assembly=mscorlib"
         mc:Ignorable="d" Title="Taskbar" Background="{DynamicResource BackgroundBrush}" Height="60" FontSize="16" Width="750" WindowStyle="None"
-        Topmost="True" ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico">
+        Topmost="True" ResizeMode="NoResize" Icon="../Images/SafeExamBrowser.ico">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="./Templates/Colors.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
-                <ResourceDictionary Source="./Templates/ScrollViewers.xaml" />
+                <ResourceDictionary Source="../Templates/ScrollViewers.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
@@ -28,7 +28,7 @@
         </ScrollViewer>
         <StackPanel Grid.Column="1" x:Name="NotificationStackPanel" Orientation="Horizontal" VerticalAlignment="Stretch" />
         <StackPanel Grid.Column="2" x:Name="SystemControlStackPanel" Orientation="Horizontal" VerticalAlignment="Stretch" />
-        <local:TaskbarClock Grid.Column="3" x:Name="Clock" Foreground="{StaticResource SecondaryTextBrush}" Padding="10,0,10,0" />
+        <local:Clock Grid.Column="3" x:Name="Clock" Foreground="{StaticResource SecondaryTextBrush}" Padding="10,0,10,0" />
-        <local:TaskbarQuitButton Grid.Column="4" x:Name="QuitButton" />
+        <local:QuitButton Grid.Column="4" x:Name="QuitButton" />
     </Grid>
 </Window>

SafeExamBrowser.UserInterface.Mobile/Windows/Taskbar.xaml.cs

@@ -14,7 +14,7 @@ using SafeExamBrowser.UserInterface.Contracts.Shell;
 using SafeExamBrowser.UserInterface.Contracts.Shell.Events;
 using SafeExamBrowser.UserInterface.Shared.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
 	public partial class Taskbar : Window, ITaskbar
 	{

SafeExamBrowser.UserInterface.Mobile/Windows/Taskview.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Taskview"
+<Window x:Class="SafeExamBrowser.UserInterface.Mobile.Windows.Taskview"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -9,7 +9,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="./Templates/Colors.xaml" />
+                <ResourceDictionary Source="../Templates/Colors.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>

SafeExamBrowser.UserInterface.Mobile/Windows/Taskview.xaml.cs

@@ -14,22 +14,22 @@ using System.Windows.Controls;
 using System.Windows.Interop;
 using SafeExamBrowser.Applications.Contracts;
 using SafeExamBrowser.UserInterface.Contracts.Shell;
-using SafeExamBrowser.UserInterface.Mobile.Controls;
+using SafeExamBrowser.UserInterface.Mobile.Controls.Taskview;
 
-namespace SafeExamBrowser.UserInterface.Mobile
+namespace SafeExamBrowser.UserInterface.Mobile.Windows
 {
 	public partial class Taskview : Window, ITaskview
 	{
 		private IList<IApplication> applications;
-		private LinkedListNode<TaskviewWindowControl> current;
+		private LinkedListNode<WindowControl> current;
-		private LinkedList<TaskviewWindowControl> controls;
+		private LinkedList<WindowControl> controls;
 
 		internal IntPtr Handle { get; private set; }
 
 		public Taskview()
 		{
 			applications = new List<IApplication>();
-			controls = new LinkedList<TaskviewWindowControl>();
+			controls = new LinkedList<WindowControl>();
 
 			InitializeComponent();
 			InitializeTaskview();
@@ -152,7 +152,7 @@ namespace SafeExamBrowser.UserInterface.Mobile
 				for (var column = 0; column < maxColumns && windows.Any(); column++)
 				{
 					var window = windows.Pop();
-					var control = new TaskviewWindowControl(window, this);
+					var control = new WindowControl(window, this);
 
 					controls.AddLast(control);
 					row.Children.Add(control);