diff --git a/qController.Standard/Classes/Settings/QIcon.cs b/qController.Standard/Classes/Helpers/QIcon.cs
similarity index 100%
rename from qController.Standard/Classes/Settings/QIcon.cs
rename to qController.Standard/Classes/Helpers/QIcon.cs
diff --git a/qController.Standard/Classes/Dialogs/AddInstancePrompt.cs b/qController.Standard/Classes/UI/Dialogs/AddInstancePrompt.cs
similarity index 97%
rename from qController.Standard/Classes/Dialogs/AddInstancePrompt.cs
rename to qController.Standard/Classes/UI/Dialogs/AddInstancePrompt.cs
index 2e08604..7eb8dbc 100644
--- a/qController.Standard/Classes/Dialogs/AddInstancePrompt.cs
+++ b/qController.Standard/Classes/UI/Dialogs/AddInstancePrompt.cs
@@ -1,7 +1,7 @@
 using Acr.UserDialogs;
 using qController.Communication;
 
-namespace qController.Dialogs
+namespace qController.UI.Dialogs
 {
     public class AddInstancePrompt : PromptConfig
     {
diff --git a/qController.Standard/Classes/Dialogs/DonatePrompt.cs b/qController.Standard/Classes/UI/Dialogs/DonatePrompt.cs
similarity index 94%
rename from qController.Standard/Classes/Dialogs/DonatePrompt.cs
rename to qController.Standard/Classes/UI/Dialogs/DonatePrompt.cs
index 790a37e..3fbf397 100644
--- a/qController.Standard/Classes/Dialogs/DonatePrompt.cs
+++ b/qController.Standard/Classes/UI/Dialogs/DonatePrompt.cs
@@ -2,7 +2,7 @@
 using Acr.UserDialogs;
 using Xamarin.Essentials;
 
-namespace qController.Dialogs
+namespace qController.UI.Dialogs
 {
     public class DonatePrompt : ConfirmConfig
     {
diff --git a/qController.Standard/Classes/Dialogs/NoWorkspacesConfig.cs b/qController.Standard/Classes/UI/Dialogs/NoWorkspacesConfig.cs
similarity index 90%
rename from qController.Standard/Classes/Dialogs/NoWorkspacesConfig.cs
rename to qController.Standard/Classes/UI/Dialogs/NoWorkspacesConfig.cs
index cc21a6e..0501a67 100644
--- a/qController.Standard/Classes/Dialogs/NoWorkspacesConfig.cs
+++ b/qController.Standard/Classes/UI/Dialogs/NoWorkspacesConfig.cs
@@ -1,7 +1,7 @@
 using System;
 using Acr.UserDialogs;
 
-namespace qController.Dialogs
+namespace qController.UI.Dialogs
 {
     public class NoWorkspacesConfig : ConfirmConfig
     {
diff --git a/qController.Standard/Classes/Dialogs/WorkspacePrompt.cs b/qController.Standard/Classes/UI/Dialogs/WorkspacePrompt.cs
similarity index 98%
rename from qController.Standard/Classes/Dialogs/WorkspacePrompt.cs
rename to qController.Standard/Classes/UI/Dialogs/WorkspacePrompt.cs
index 0096c0b..0875d50 100644
--- a/qController.Standard/Classes/Dialogs/WorkspacePrompt.cs
+++ b/qController.Standard/Classes/UI/Dialogs/WorkspacePrompt.cs
@@ -5,7 +5,7 @@ using qController.QItems;
 using Serilog;
 using QControlKit;
 
-namespace qController.Dialogs
+namespace qController.UI.Dialogs
 {
     public class WorkspacePromptArgs : EventArgs
     {
diff --git a/qController.Standard/Classes/UI/QCueGridListHelper.cs b/qController.Standard/Classes/UI/QCueGridListHelper.cs
new file mode 100644
index 0000000..2bdd0fa
--- /dev/null
+++ b/qController.Standard/Classes/UI/QCueGridListHelper.cs
@@ -0,0 +1,10 @@
+using System;
+namespace qController
+{
+    public class QCueGridListHelper
+    {
+        public QCueGridListHelper()
+        {
+        }
+    }
+}