diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
index fd72288c..349644ce 100644
--- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj
+++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
@@ -62,10 +62,10 @@
     <Compile Update="Views\Library\MainTabbedPage.xaml.cs">
       <DependentUpon>MainTabbedPage.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\PlayerCharacter\ItemPicker.xaml.cs">
+    <Compile Update="Views\ItemPicker.xaml.cs">
       <DependentUpon>ItemPicker.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\PlayerCharacter\ItemPickerView.xaml.cs">
+    <Compile Update="Views\ItemPickerView.xaml.cs">
       <DependentUpon>ItemPickerView.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
@@ -106,10 +106,10 @@
     <EmbeddedResource Update="Views\PlayerCharacter\PlayerCharacterEditorPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Views\PlayerCharacter\StringPicker.xaml">
+    <EmbeddedResource Update="Views\StringPicker.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Views\PlayerCharacter\StringPickerView.xaml">
+    <EmbeddedResource Update="Views\StringPickerView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Views\TextInputCancellableView.xaml">
diff --git a/AideDeJeu/AideDeJeu/Models/Items/Attribute.cs b/AideDeJeu/AideDeJeu/Models/Items/ItemAttribute.cs
similarity index 100%
rename from AideDeJeu/AideDeJeu/Models/Items/Attribute.cs
rename to AideDeJeu/AideDeJeu/Models/Items/ItemAttribute.cs
diff --git a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
index d2c4c6ed..9baea729 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
@@ -1,6 +1,7 @@
 using AideDeJeu.Tools;
 using AideDeJeu.ViewModels.Library;
 using AideDeJeu.Views;
+using AideDeJeu.Views.Library;
 using AideDeJeuLib;
 using Rg.Plugins.Popup.Services;
 using System;
@@ -73,7 +74,7 @@ namespace AideDeJeu.ViewModels
         public async Task GotoLibraryPageAsync()
         {
             //await Navigation.PushAsync(new Views.ItemDetailPage(),true);
-            await Navigation.PushAsync(new Views.MainTabbedPage(), true);
+            await Navigation.PushAsync(new Views.Library.MainTabbedPage(), true);
             //TestNotify = new NotifyTaskCompletion<bool>(TestGotoAsync(), true);
         }
 
@@ -88,7 +89,7 @@ namespace AideDeJeu.ViewModels
 
         public async Task GotoBookmarksPageAsync()
         {
-            await Navigation.PushAsync(new Views.BookmarksPage(), true);
+            await Navigation.PushAsync(new Views.Library.BookmarksPage(), true);
         }
 
 
@@ -104,7 +105,7 @@ namespace AideDeJeu.ViewModels
 
         public async Task GotoPlayerCharacterEditorPageAsync()
         {
-            await Navigation.PushAsync(new Views.PlayerCharacterEditorPage(), true);
+            await Navigation.PushAsync(new Views.PlayerCharacter.PlayerCharacterEditorPage(), true);
         }
 
         private Command _DeepSearchCommand = null;
@@ -118,7 +119,7 @@ namespace AideDeJeu.ViewModels
 
         public async Task GotoDeepSearchPageAsync()
         {
-            await Navigation.PushAsync(new Views.DeepSearchPage(), true);
+            await Navigation.PushAsync(new Views.Library.DeepSearchPage(), true);
         }
 
         private Command _AddToFavoritesCommand = null;
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ItemPicker.xaml b/AideDeJeu/AideDeJeu/Views/ItemPicker.xaml
similarity index 100%
rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/ItemPicker.xaml
rename to AideDeJeu/AideDeJeu/Views/ItemPicker.xaml
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ItemPicker.xaml.cs b/AideDeJeu/AideDeJeu/Views/ItemPicker.xaml.cs
similarity index 100%
rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/ItemPicker.xaml.cs
rename to AideDeJeu/AideDeJeu/Views/ItemPicker.xaml.cs
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ItemPickerView.xaml b/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml
similarity index 100%
rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/ItemPickerView.xaml
rename to AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ItemPickerView.xaml.cs b/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml.cs
similarity index 100%
rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/ItemPickerView.xaml.cs
rename to AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml.cs
diff --git a/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml
index 332ec33c..6b4079d5 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
             xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
              xmlns:tools="clr-namespace:AideDeJeu.Tools"
-             x:Class="AideDeJeu.Views.BookmarksPage"
+             x:Class="AideDeJeu.Views.Library.BookmarksPage"
              x:Name="This"
              Title="Favoris"
              Icon="stars_stack.png">
diff --git a/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml.cs
index 771fb32c..e1fd1fa5 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
 	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class BookmarksPage : ContentPage
diff --git a/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml
index be5ec2d8..8e8e44ca 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml
@@ -2,7 +2,7 @@
 <ContentPage 
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="AideDeJeu.Views.DeepSearchPage"
+    x:Class="AideDeJeu.Views.Library.DeepSearchPage"
     xmlns:tools="clr-namespace:AideDeJeu.Tools" 
     xmlns:properties="clr-namespace:AideDeJeu.Properties"
     x:Name="This" 
diff --git a/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml.cs
index 50e4539c..3fa543b6 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml.cs
@@ -10,7 +10,7 @@ using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 using static AideDeJeu.ViewModels.Library.DeepSearchViewModel;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
 	[XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class DeepSearchPage : ContentPage
diff --git a/AideDeJeu/AideDeJeu/Views/Library/FilteredItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/FilteredItemsPage.xaml
index 52ecb887..b4b641e3 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/FilteredItemsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Library/FilteredItemsPage.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
     xmlns:local="clr-namespace:AideDeJeu.Views" 
     xmlns:tools="clr-namespace:AideDeJeu.Tools" 
-    x:Class="AideDeJeu.Views.FilteredItemsPage" 
+    x:Class="AideDeJeu.Views.Library.FilteredItemsPage" 
     x:Name="This" 
     Title="{Binding Title}">
     <MasterDetailPage.Resources>
diff --git a/AideDeJeu/AideDeJeu/Views/Library/FilteredItemsPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/Library/FilteredItemsPage.xaml.cs
index ff1b4ddf..c56c31df 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/FilteredItemsPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/Library/FilteredItemsPage.xaml.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class FilteredItemsPage : MasterDetailPage
diff --git a/AideDeJeu/AideDeJeu/Views/Library/ItemDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/ItemDetailPage.xaml
index 3a085460..187442ca 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/ItemDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Library/ItemDetailPage.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:tools="clr-namespace:AideDeJeu.Tools"
              xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
-             x:Class="AideDeJeu.Views.ItemDetailPage"
+             x:Class="AideDeJeu.Views.Library.ItemDetailPage"
              Title="{Binding Title}"
              Icon="spell_book.png"
              x:Name="This">
diff --git a/AideDeJeu/AideDeJeu/Views/Library/ItemDetailPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/Library/ItemDetailPage.xaml.cs
index d7295300..1a996906 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/ItemDetailPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/Library/ItemDetailPage.xaml.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class ItemDetailPage : ContentPage
diff --git a/AideDeJeu/AideDeJeu/Views/Library/ItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/ItemsPage.xaml
index 258fed56..33e448e6 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/ItemsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Library/ItemsPage.xaml
@@ -5,7 +5,7 @@
     xmlns:local="clr-namespace:AideDeJeu.Views" 
     xmlns:tools="clr-namespace:AideDeJeu.Tools" 
     xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
-    x:Class="AideDeJeu.Views.ItemsPage" 
+    x:Class="AideDeJeu.Views.Library.ItemsPage" 
     x:Name="This" 
     Title="{Binding Title}">
     <ContentPage.Resources>
diff --git a/AideDeJeu/AideDeJeu/Views/Library/ItemsPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/Library/ItemsPage.xaml.cs
index 1ce08dca..5667ce8c 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/ItemsPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/Library/ItemsPage.xaml.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
 	public partial class ItemsPage : ContentPage
diff --git a/AideDeJeu/AideDeJeu/Views/Library/MainTabbedPage.xaml b/AideDeJeu/AideDeJeu/Views/Library/MainTabbedPage.xaml
index ffb80fdb..73f6b14f 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/MainTabbedPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Library/MainTabbedPage.xaml
@@ -3,9 +3,11 @@
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:views="clr-namespace:AideDeJeu.Views"
+    xmlns:libviews="clr-namespace:AideDeJeu.Views.Library"
+    xmlns:pcviews="clr-namespace:AideDeJeu.Views.PlayerCharacter"
     xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core"
     xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
-    x:Class="AideDeJeu.Views.MainTabbedPage"
+    x:Class="AideDeJeu.Views.Library.MainTabbedPage"
     Padding="0"
     IsEnabled="{Binding Main.IsEnabled}"
     SelectedTabColor="{StaticResource HDRed}"
@@ -21,21 +23,21 @@
             </x:Arguments>
         </Size>
     </windows:TabbedPage.HeaderIconsSize>
-    <views:ItemDetailPage x:Name="NavigationPage" Title="Bibliothèque" Icon="spell_book.png">
+    <libviews:ItemDetailPage x:Name="NavigationPage" Title="Bibliothèque" Icon="spell_book.png">
         <!--<x:Arguments>
             <views:ItemDetailPage />
         </x:Arguments>-->
-    </views:ItemDetailPage>
-    <views:BookmarksPage Title="Favoris" Icon="stars_stack.png">
+    </libviews:ItemDetailPage>
+    <libviews:BookmarksPage Title="Favoris" Icon="stars_stack.png">
         <!--<x:Arguments>
             <views:BookmarksPage />
         </x:Arguments>-->
-    </views:BookmarksPage>
-    <views:DeepSearchPage Title="Recherche" Icon="crystal_ball.png">
+    </libviews:BookmarksPage>
+    <libviews:DeepSearchPage Title="Recherche" Icon="crystal_ball.png">
         <!--<x:Arguments>
             <views:DeepSearchPage />
         </x:Arguments>-->
-    </views:DeepSearchPage>
+    </libviews:DeepSearchPage>
     <!--<views:AboutPage Title="À propos de..." Icon="wooden_sign.png">
     </views:AboutPage>-->
 </TabbedPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/Library/MainTabbedPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/Library/MainTabbedPage.xaml.cs
index e334b574..1bf32a7c 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/MainTabbedPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/Library/MainTabbedPage.xaml.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.Library
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class MainTabbedPage : TabbedPage
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml
index a0191b45..c841b6de 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml
@@ -2,7 +2,7 @@
 <TabbedPage 
         xmlns="http://xamarin.com/schemas/2014/forms"
         xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-        x:Class="AideDeJeu.Views.PlayerCharacterEditorPage"
+        x:Class="AideDeJeu.Views.PlayerCharacter.PlayerCharacterEditorPage"
         xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core"
         xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
         xmlns:tools="clr-namespace:AideDeJeu.Tools"
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs
index f0bbfbe2..ede07b6d 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
-namespace AideDeJeu.Views
+namespace AideDeJeu.Views.PlayerCharacter
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class PlayerCharacterEditorPage : TabbedPage
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/StringPicker.xaml b/AideDeJeu/AideDeJeu/Views/StringPicker.xaml
similarity index 100%
rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/StringPicker.xaml
rename to AideDeJeu/AideDeJeu/Views/StringPicker.xaml
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/StringPicker.xaml.cs b/AideDeJeu/AideDeJeu/Views/StringPicker.xaml.cs
similarity index 100%
rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/StringPicker.xaml.cs
rename to AideDeJeu/AideDeJeu/Views/StringPicker.xaml.cs
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/StringPickerView.xaml b/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml
similarity index 100%
rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/StringPickerView.xaml
rename to AideDeJeu/AideDeJeu/Views/StringPickerView.xaml
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/StringPickerView.xaml.cs b/AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs
similarity index 100%
rename from AideDeJeu/AideDeJeu/Views/PlayerCharacter/StringPickerView.xaml.cs
rename to AideDeJeu/AideDeJeu/Views/StringPickerView.xaml.cs