diff --git a/BookAStar/BookAStar/ViewModels/ChatViewModel.cs b/BookAStar/BookAStar/ViewModels/Chat/ChatViewModel.cs
similarity index 100%
rename from BookAStar/BookAStar/ViewModels/ChatViewModel.cs
rename to BookAStar/BookAStar/ViewModels/Chat/ChatViewModel.cs
diff --git a/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs b/BookAStar/BookAStar/ViewModels/Estimate/BillingLineViewModel.cs
similarity index 100%
rename from BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
rename to BookAStar/BookAStar/ViewModels/Estimate/BillingLineViewModel.cs
diff --git a/BookAStar/BookAStar/ViewModels/EditEstimateViewModel.cs b/BookAStar/BookAStar/ViewModels/Estimate/EditEstimateViewModel.cs
similarity index 100%
rename from BookAStar/BookAStar/ViewModels/EditEstimateViewModel.cs
rename to BookAStar/BookAStar/ViewModels/Estimate/EditEstimateViewModel.cs
diff --git a/BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs b/BookAStar/BookAStar/ViewModels/Query/BookQueriesViewModel.cs
similarity index 100%
rename from BookAStar/BookAStar/ViewModels/BookQueriesViewModel.cs
rename to BookAStar/BookAStar/ViewModels/Query/BookQueriesViewModel.cs
diff --git a/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs b/BookAStar/BookAStar/ViewModels/Query/BookQueryViewModel.cs
similarity index 81%
rename from BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
rename to BookAStar/BookAStar/ViewModels/Query/BookQueryViewModel.cs
index 0c1a5ff6..ba2a3c32 100644
--- a/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/Query/BookQueryViewModel.cs
@@ -1,17 +1,15 @@
-using BookAStar.Data;
-using BookAStar.Interfaces;
-using BookAStar.Model;
-using BookAStar.Model.Social;
+
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using XLabs.Forms.Mvvm;
 
 namespace BookAStar.ViewModels
 {
-    class BookQueryViewModel : XLabs.Forms.Mvvm.ViewModel, IBookQueryData
+    using Data;
+    using Interfaces;
+    using Model;
+    using Model.Social;
+    class BookQueryViewModel : ViewModel, IBookQueryData
     {
         public BookQueryViewModel()
         {
diff --git a/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs b/BookAStar/BookAStar/ViewModels/User/DashboardViewModel.cs
similarity index 100%
rename from BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
rename to BookAStar/BookAStar/ViewModels/User/DashboardViewModel.cs
diff --git a/BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs b/BookAStar/BookAStar/ViewModels/User/UserLoginViewModel.cs
similarity index 72%
rename from BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs
rename to BookAStar/BookAStar/ViewModels/User/UserLoginViewModel.cs
index a38ec1a6..8a84d38a 100644
--- a/BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/User/UserLoginViewModel.cs
@@ -9,6 +9,7 @@ namespace BookAStar.ViewModels
 {
     class UserLoginViewModel : ViewModel
     {
-
+        public string UserName { get; set; }
+        public string Password { get; set; }
     }
 }