diff --git a/BookAStar/BookAStar/Pages/BlogPage.cs b/BookAStar/BookAStar/Pages/BlogPages/BlogPage.cs
similarity index 97%
rename from BookAStar/BookAStar/Pages/BlogPage.cs
rename to BookAStar/BookAStar/Pages/BlogPages/BlogPage.cs
index c19d3f1f..135c9f9a 100644
--- a/BookAStar/BookAStar/Pages/BlogPage.cs
+++ b/BookAStar/BookAStar/Pages/BlogPages/BlogPage.cs
@@ -2,7 +2,7 @@
 
 using Xamarin.Forms;
 
-namespace BookAStar.Pages
+namespace BookAStar.Pages.BlogPages
 {
     public class BlogPage : ContentPage
     {
diff --git a/BookAStar/BookAStar/Pages/ChatPage.xaml.cs b/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
index 3d4625ad..83a26464 100644
--- a/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/ChatPage.xaml.cs
@@ -6,9 +6,9 @@ using Xamarin.Forms;
 namespace BookAStar.Pages
 {
     using Data;
-    using Model;
     using System.Linq;
-    using ViewModels;
+    using ViewModels.Messaging;
+
     public partial class ChatPage : TabbedPage
     {
         public string ChatUser { get; set; }
diff --git a/BookAStar/BookAStar/Pages/Estimate/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/Estimate/BookQueriesPage.xaml.cs
index 4b08b0f9..56febae2 100644
--- a/BookAStar/BookAStar/Pages/Estimate/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/Estimate/BookQueriesPage.xaml.cs
@@ -7,6 +7,8 @@ using XLabs.Platform.Services;
 namespace BookAStar.Pages
 {
     using Data;
+    using ViewModels.EstimateAndBilling;
+
     public partial class BookQueriesPage : ContentPage
     {
         public BookQueriesPage()
diff --git a/BookAStar/BookAStar/Pages/Estimate/BookQueryPage.xaml.cs b/BookAStar/BookAStar/Pages/Estimate/BookQueryPage.xaml.cs
index dbc0377f..a09a7e63 100644
--- a/BookAStar/BookAStar/Pages/Estimate/BookQueryPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/Estimate/BookQueryPage.xaml.cs
@@ -8,7 +8,7 @@ namespace BookAStar.Pages
     using Model;
     using Model.Workflow;
     using System.Linq;
-    using ViewModels;
+    using ViewModels.EstimateAndBilling;
 
     public partial class BookQueryPage : ContentPage
     {
diff --git a/BookAStar/BookAStar/Pages/Estimate/EditBillingLinePage.xaml.cs b/BookAStar/BookAStar/Pages/Estimate/EditBillingLinePage.xaml.cs
index 0667afe1..da6674f3 100644
--- a/BookAStar/BookAStar/Pages/Estimate/EditBillingLinePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/Estimate/EditBillingLinePage.xaml.cs
@@ -1,5 +1,6 @@
 using BookAStar.Data;
 using BookAStar.ViewModels;
+using BookAStar.ViewModels.EstimateAndBilling;
 using System;
 using System.Collections.Generic;
 using Xamarin.Forms;
diff --git a/BookAStar/BookAStar/Pages/Estimate/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/Estimate/EditEstimatePage.xaml.cs
index 4c46a728..a280e617 100644
--- a/BookAStar/BookAStar/Pages/Estimate/EditEstimatePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/Estimate/EditEstimatePage.xaml.cs
@@ -5,7 +5,8 @@ namespace BookAStar.Pages
 {
     using Data;
     using Model.Workflow;
-    using ViewModels;
+    using ViewModels.EstimateAndBilling;
+
     public partial class EditEstimatePage : ContentPage
     {
 
diff --git a/BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml b/BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml
similarity index 95%
rename from BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml
rename to BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml
index 14d8eac2..31062f0d 100644
--- a/BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml
+++ b/BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml
@@ -2,7 +2,7 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="BookAStar.Pages.AccountChooserPage"
+             x:Class="BookAStar.Pages.UserProfile.AccountChooserPage"
              Title="Paramètres Booking star" Style="{StaticResource PageStyle}"
              xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
              xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms">
@@ -16,7 +16,6 @@
         >
       <ListView.Header>
         <StackLayout Orientation="Horizontal">
-
           <Button x:Name="AddAccountBtn" Text="Connection, ou création d'un compte" />
         </StackLayout>
       </ListView.Header>
diff --git a/BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml.cs b/BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml.cs
similarity index 94%
rename from BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml.cs
rename to BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml.cs
index b41e7be6..01bc58ca 100644
--- a/BookAStar/BookAStar/Pages/User/AccountChooserPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/UserProfile/AccountChooserPage.xaml.cs
@@ -1,17 +1,15 @@
-using BookAStar.Model.Auth.Account;
+
 using System;
-using System.Threading.Tasks;
 using Xamarin.Forms;
 using System.Windows.Input;
 using System.Collections.ObjectModel;
 using System.Collections.Generic;
-using System.ComponentModel;
 using BookAStar.Helpers;
 using XLabs.Forms.Behaviors;
-using System.Diagnostics;
 using XLabs.Forms.Controls;
+using BookAStar.Model.Auth.Account;
 
-namespace BookAStar.Pages
+namespace BookAStar.Pages.UserProfile
 {
    
     public partial class AccountChooserPage : ContentPage
diff --git a/BookAStar/BookAStar/Pages/User/DashboardPage.xaml b/BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml
similarity index 96%
rename from BookAStar/BookAStar/Pages/User/DashboardPage.xaml
rename to BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml
index a86f9f59..a6c1ab0b 100644
--- a/BookAStar/BookAStar/Pages/User/DashboardPage.xaml
+++ b/BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml
@@ -4,7 +4,7 @@
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
              xmlns:extensions="clr-namespace:BookAStar.Extensions;assembly=BookAStar"
-             x:Class="BookAStar.Pages.DashboardPage"
+             x:Class="BookAStar.Pages.UserProfile.DashboardPage"
              xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
              xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms"
              Style="{StaticResource PageStyle}">
@@ -52,6 +52,7 @@
       <Button Text="{Binding PerformerStatus}" Clicked="OnViewPerformerStatus" />
       <Button Text="{Binding UserQueries}" Clicked="OnViewUserQueries"
               VisualElement.IsVisible="{Binding UserIsPro}"/>
+      <Button Text="{Binding UserFilesLabel}" Clicked="OnManageFiles" />
       <StackLayout Orientation="Horizontal" VisualElement.IsVisible="{Binding HaveAnUser}">
         <Label Text="Recevoir les notifications push" StyleClass="Header" />
         <Switch IsToggled="{Binding ReceivePushNotifications, Mode=TwoWay}"
diff --git a/BookAStar/BookAStar/Pages/User/DashboardPage.xaml.cs b/BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml.cs
similarity index 79%
rename from BookAStar/BookAStar/Pages/User/DashboardPage.xaml.cs
rename to BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml.cs
index f33d4004..f8232cab 100644
--- a/BookAStar/BookAStar/Pages/User/DashboardPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/UserProfile/DashboardPage.xaml.cs
@@ -1,22 +1,13 @@
-using BookAStar.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using System;
 using Xamarin.Forms;
 using XLabs.Forms.Behaviors;
-using XLabs.Forms.Controls;
-using XLabs.Forms.Mvvm;
-using XLabs.Ioc;
-using XLabs.Platform.Services;
 
-namespace BookAStar.Pages
+namespace BookAStar.Pages.UserProfile
 {
+    using Data;
+    using ViewModels.UserProfile;
     public partial class DashboardPage : ContentPage
     {
-        
 
         public DashboardPage()
         {
@@ -32,6 +23,10 @@ namespace BookAStar.Pages
                         ShowPage<AccountChooserPage>(null, true);
                     });
         }
+        public void OnManageFiles(object sender, EventArgs e)
+        {
+            ShowPage<UserFiles>(new object[] { new DirectoryInfoViewModel() }, true);
+        }
         public void OnViewPerformerStatus(object sender, EventArgs e)
         {
             ShowPage<AccountChooserPage>(null, true);
diff --git a/BookAStar/BookAStar/ViewModels/Estimate/BillingLineViewModel.cs b/BookAStar/BookAStar/ViewModels/EstimateAndBilling/BillingLineViewModel.cs
similarity index 98%
rename from BookAStar/BookAStar/ViewModels/Estimate/BillingLineViewModel.cs
rename to BookAStar/BookAStar/ViewModels/EstimateAndBilling/BillingLineViewModel.cs
index 051280bb..061238a9 100644
--- a/BookAStar/BookAStar/ViewModels/Estimate/BillingLineViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/EstimateAndBilling/BillingLineViewModel.cs
@@ -4,10 +4,8 @@ using BookAStar.Model.Workflow;
 using System;
 using System.Globalization;
 using System.Windows.Input;
-using Xamarin.Forms;
-using XLabs.Forms.Mvvm;
 
-namespace BookAStar.ViewModels
+namespace BookAStar.ViewModels.EstimateAndBilling
 {
     public class BillingLineViewModel : EditingViewModel, IBillingLine
     {
diff --git a/BookAStar/BookAStar/ViewModels/Query/BookQueriesViewModel.cs b/BookAStar/BookAStar/ViewModels/EstimateAndBilling/BookQueriesViewModel.cs
similarity index 91%
rename from BookAStar/BookAStar/ViewModels/Query/BookQueriesViewModel.cs
rename to BookAStar/BookAStar/ViewModels/EstimateAndBilling/BookQueriesViewModel.cs
index 76becbeb..51c6eaa2 100644
--- a/BookAStar/BookAStar/ViewModels/Query/BookQueriesViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/EstimateAndBilling/BookQueriesViewModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
 using System.Windows.Input;
 
-namespace BookAStar.ViewModels
+namespace BookAStar.ViewModels.EstimateAndBilling
 {
     using Data;
     using Model;
diff --git a/BookAStar/BookAStar/ViewModels/Query/BookQueryViewModel.cs b/BookAStar/BookAStar/ViewModels/EstimateAndBilling/BookQueryViewModel.cs
similarity index 96%
rename from BookAStar/BookAStar/ViewModels/Query/BookQueryViewModel.cs
rename to BookAStar/BookAStar/ViewModels/EstimateAndBilling/BookQueryViewModel.cs
index ba2a3c32..61d8cefc 100644
--- a/BookAStar/BookAStar/ViewModels/Query/BookQueryViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/EstimateAndBilling/BookQueryViewModel.cs
@@ -3,7 +3,7 @@ using System;
 using System.Diagnostics;
 using XLabs.Forms.Mvvm;
 
-namespace BookAStar.ViewModels
+namespace BookAStar.ViewModels.EstimateAndBilling
 {
     using Data;
     using Interfaces;
diff --git a/BookAStar/BookAStar/ViewModels/Estimate/EditEstimateViewModel.cs b/BookAStar/BookAStar/ViewModels/EstimateAndBilling/EditEstimateViewModel.cs
similarity index 98%
rename from BookAStar/BookAStar/ViewModels/Estimate/EditEstimateViewModel.cs
rename to BookAStar/BookAStar/ViewModels/EstimateAndBilling/EditEstimateViewModel.cs
index 521851b9..bac110be 100644
--- a/BookAStar/BookAStar/ViewModels/Estimate/EditEstimateViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/EstimateAndBilling/EditEstimateViewModel.cs
@@ -6,7 +6,7 @@ using Xamarin.Forms;
 using BookAStar.Data;
 using Newtonsoft.Json;
 
-namespace BookAStar.ViewModels
+namespace BookAStar.ViewModels.EstimateAndBilling
 {
     public class EditEstimateViewModel : EditingViewModel
     {
diff --git a/BookAStar/BookAStar/ViewModels/Chat/ChatViewModel.cs b/BookAStar/BookAStar/ViewModels/Messaging/ChatViewModel.cs
similarity index 98%
rename from BookAStar/BookAStar/ViewModels/Chat/ChatViewModel.cs
rename to BookAStar/BookAStar/ViewModels/Messaging/ChatViewModel.cs
index 46fa210a..365af6d9 100644
--- a/BookAStar/BookAStar/ViewModels/Chat/ChatViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/Messaging/ChatViewModel.cs
@@ -4,7 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using XLabs.Forms.Mvvm;
 
-namespace BookAStar.ViewModels
+namespace BookAStar.ViewModels.Messaging
 {
     using Data;
     using Model;
diff --git a/BookAStar/BookAStar/ViewModels/Signing/EstimateSignaturePad.cs b/BookAStar/BookAStar/ViewModels/Signing/EstimateSignaturePad.cs
new file mode 100644
index 00000000..b658b05d
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/Signing/EstimateSignaturePad.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XLabs.Forms.Mvvm;
+
+namespace BookAStar.ViewModels.Signing
+{
+    class EstimateSignaturePad: ViewModel
+    {
+
+    }
+}
diff --git a/BookAStar/BookAStar/ViewModels/User/UserLoginViewModel.cs b/BookAStar/BookAStar/ViewModels/User/UserLoginViewModel.cs
deleted file mode 100644
index 8a84d38a..00000000
--- a/BookAStar/BookAStar/ViewModels/User/UserLoginViewModel.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using XLabs.Forms.Mvvm;
-
-namespace BookAStar.ViewModels
-{
-    class UserLoginViewModel : ViewModel
-    {
-        public string UserName { get; set; }
-        public string Password { get; set; }
-    }
-}
diff --git a/BookAStar/BookAStar/ViewModels/User/DashboardViewModel.cs b/BookAStar/BookAStar/ViewModels/UserProfile/DashboardViewModel.cs
similarity index 97%
rename from BookAStar/BookAStar/ViewModels/User/DashboardViewModel.cs
rename to BookAStar/BookAStar/ViewModels/UserProfile/DashboardViewModel.cs
index e744cdbc..7206b6e3 100644
--- a/BookAStar/BookAStar/ViewModels/User/DashboardViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/UserProfile/DashboardViewModel.cs
@@ -7,15 +7,20 @@ using XLabs.Forms.Mvvm;
 using XLabs.Ioc;
 using XLabs.Platform.Services;
 
-namespace BookAStar.ViewModels
+namespace BookAStar.ViewModels.UserProfile
 {
     using Data;
     using Helpers;
     using Model.Auth.Account;
-    using Pages;
+    using Pages.UserProfile;
 
     internal class DashboardViewModel : ViewModel
     {
+        public string UserFilesLabel
+        {
+            get; set;
+        }
+
         int rating;
         public int Rating
         {