diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index ef588e9..2a3de7b 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -88,64 +88,64 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Compile Update="Pages\MyListPage.xaml.cs">
+	  <Compile Update="Views\MyListPage.xaml.cs">
 	    <DependentUpon>MyListPage.xaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="Views\IngredientEntry.xaml.cs">
+	  <Compile Update="Views\Components\IngredientEntry.xaml.cs">
 	    <DependentUpon>IngredientEntry.xaml</DependentUpon>
 	  </Compile>
 	</ItemGroup>
 
 	<ItemGroup>
-	  <MauiXaml Update="Pages\CreateRecipePage.xaml">
+	  <MauiXaml Update="Views\CreateRecipePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\Splash.xaml">
+	  <MauiXaml Update="Views\Splash.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\CounterView.xaml">
+	  <MauiXaml Update="Views\Components\CounterView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\HeadedButton.xaml">
+	  <MauiXaml Update="Views\Components\HeadedButton.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\IngredientEntry.xaml">
+	  <MauiXaml Update="Views\Components\IngredientEntry.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\IngredientView.xaml">
+	  <MauiXaml Update="Views\Components\IngredientView.xaml">
 		  <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\FavoritesPage.xaml">
+	  <MauiXaml Update="Views\FavoritesPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\MorePage.xaml">
+	  <MauiXaml Update="Views\MorePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\ProfilePage.xaml">
+	  <MauiXaml Update="Views\ProfilePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\RecipePage.xaml">
+	  <MauiXaml Update="Views\RecipePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\RecipeView.xaml">
+	  <MauiXaml Update="Views\Components\RecipeView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\RegisterPage.xaml">
+	  <MauiXaml Update="Views\RegisterPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\SearchPage.xaml">
+	  <MauiXaml Update="Views\SearchPage.xaml">
 		  <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\RecipeView.xaml">
+	  <MauiXaml Update="Views\Components\RecipeView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Views\SearchPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\StepEntry.xaml">
+	  <MauiXaml Update="Views\Components\StepEntry.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\StoredRecipeView.xaml">
+	  <MauiXaml Update="Views\Components\StoredRecipeView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	</ItemGroup>
diff --git a/Pages/ChangePassword.xaml b/Views/ChangePassword.xaml
similarity index 100%
rename from Pages/ChangePassword.xaml
rename to Views/ChangePassword.xaml
diff --git a/Pages/ChangePassword.xaml.cs b/Views/ChangePassword.xaml.cs
similarity index 100%
rename from Pages/ChangePassword.xaml.cs
rename to Views/ChangePassword.xaml.cs
diff --git a/Views/CounterView.xaml b/Views/Components/CounterView.xaml
similarity index 100%
rename from Views/CounterView.xaml
rename to Views/Components/CounterView.xaml
diff --git a/Views/CounterView.xaml.cs b/Views/Components/CounterView.xaml.cs
similarity index 100%
rename from Views/CounterView.xaml.cs
rename to Views/Components/CounterView.xaml.cs
diff --git a/Views/HeadedButton.xaml b/Views/Components/HeadedButton.xaml
similarity index 100%
rename from Views/HeadedButton.xaml
rename to Views/Components/HeadedButton.xaml
diff --git a/Views/HeadedButton.xaml.cs b/Views/Components/HeadedButton.xaml.cs
similarity index 100%
rename from Views/HeadedButton.xaml.cs
rename to Views/Components/HeadedButton.xaml.cs
diff --git a/Views/IngredientEntry.xaml b/Views/Components/IngredientEntry.xaml
similarity index 100%
rename from Views/IngredientEntry.xaml
rename to Views/Components/IngredientEntry.xaml
diff --git a/Views/IngredientEntry.xaml.cs b/Views/Components/IngredientEntry.xaml.cs
similarity index 100%
rename from Views/IngredientEntry.xaml.cs
rename to Views/Components/IngredientEntry.xaml.cs
diff --git a/Views/IngredientView.xaml b/Views/Components/IngredientView.xaml
similarity index 100%
rename from Views/IngredientView.xaml
rename to Views/Components/IngredientView.xaml
diff --git a/Views/IngredientView.xaml.cs b/Views/Components/IngredientView.xaml.cs
similarity index 100%
rename from Views/IngredientView.xaml.cs
rename to Views/Components/IngredientView.xaml.cs
diff --git a/Views/OwnedRecipeView.xaml b/Views/Components/OwnedRecipeView.xaml
similarity index 100%
rename from Views/OwnedRecipeView.xaml
rename to Views/Components/OwnedRecipeView.xaml
diff --git a/Views/OwnedRecipeView.xaml.cs b/Views/Components/OwnedRecipeView.xaml.cs
similarity index 100%
rename from Views/OwnedRecipeView.xaml.cs
rename to Views/Components/OwnedRecipeView.xaml.cs
diff --git a/Views/RecipeView.xaml b/Views/Components/RecipeView.xaml
similarity index 100%
rename from Views/RecipeView.xaml
rename to Views/Components/RecipeView.xaml
diff --git a/Views/RecipeView.xaml.cs b/Views/Components/RecipeView.xaml.cs
similarity index 100%
rename from Views/RecipeView.xaml.cs
rename to Views/Components/RecipeView.xaml.cs
diff --git a/Views/StepEntry.xaml b/Views/Components/StepEntry.xaml
similarity index 97%
rename from Views/StepEntry.xaml
rename to Views/Components/StepEntry.xaml
index ffed80e..3bff27a 100644
--- a/Views/StepEntry.xaml
+++ b/Views/Components/StepEntry.xaml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="ShoopNCook.Views.StepEntry">
-    <VerticalStackLayout>
-        <HorizontalStackLayout>
-            <Label 
-                Style="{StaticResource h3}"
-                Text="Step"
-                Margin="0, 0, 2, 0"/>
-
-            <Label
-                Style="{StaticResource h3}"
-                x:Name="OrdinalLabel"/>
-        </HorizontalStackLayout>
-
-        <Border
-            StrokeShape="RoundRectangle 5"
-            Stroke="Gray"
-            BackgroundColor="{StaticResource BackgroundSecondary}">
-            <Editor
-                MaxLength="10000"
-                Style="{StaticResource UserInput}"
-                AutoSize="TextChanges"
-                FontSize="15"/>
-        </Border>
-
-    </VerticalStackLayout>
-</ContentView>
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="ShoopNCook.Views.StepEntry">
+    <VerticalStackLayout>
+        <HorizontalStackLayout>
+            <Label 
+                Style="{StaticResource h3}"
+                Text="Step"
+                Margin="0, 0, 2, 0"/>
+
+            <Label
+                Style="{StaticResource h3}"
+                x:Name="OrdinalLabel"/>
+        </HorizontalStackLayout>
+
+        <Border
+            StrokeShape="RoundRectangle 5"
+            Stroke="Gray"
+            BackgroundColor="{StaticResource BackgroundSecondary}">
+            <Editor
+                MaxLength="10000"
+                Style="{StaticResource UserInput}"
+                AutoSize="TextChanges"
+                FontSize="15"/>
+        </Border>
+
+    </VerticalStackLayout>
+</ContentView>
diff --git a/Views/StepEntry.xaml.cs b/Views/Components/StepEntry.xaml.cs
similarity index 94%
rename from Views/StepEntry.xaml.cs
rename to Views/Components/StepEntry.xaml.cs
index 1807de5..a2a229c 100644
--- a/Views/StepEntry.xaml.cs
+++ b/Views/Components/StepEntry.xaml.cs
@@ -1,19 +1,19 @@
-namespace ShoopNCook.Views;
-
-public partial class StepEntry : ContentView
-{
-	
-	public StepEntry(): this(1) 
-	{}
-
-	public StepEntry(uint ordinal)
-	{
-		InitializeComponent();
-		Ordinal = ordinal;
-	}
-
-	public uint Ordinal { 
-		get => uint.Parse(OrdinalLabel.Text);
-		set => OrdinalLabel.Text = value.ToString();
-	}
+namespace ShoopNCook.Views;
+
+public partial class StepEntry : ContentView
+{
+	
+	public StepEntry(): this(1) 
+	{}
+
+	public StepEntry(uint ordinal)
+	{
+		InitializeComponent();
+		Ordinal = ordinal;
+	}
+
+	public uint Ordinal { 
+		get => uint.Parse(OrdinalLabel.Text);
+		set => OrdinalLabel.Text = value.ToString();
+	}
 }
\ No newline at end of file
diff --git a/Views/StoredRecipeView.xaml b/Views/Components/StoredRecipeView.xaml
similarity index 100%
rename from Views/StoredRecipeView.xaml
rename to Views/Components/StoredRecipeView.xaml
diff --git a/Views/StoredRecipeView.xaml.cs b/Views/Components/StoredRecipeView.xaml.cs
similarity index 100%
rename from Views/StoredRecipeView.xaml.cs
rename to Views/Components/StoredRecipeView.xaml.cs
diff --git a/Pages/ConfirmMail.xaml b/Views/ConfirmMail.xaml
similarity index 100%
rename from Pages/ConfirmMail.xaml
rename to Views/ConfirmMail.xaml
diff --git a/Pages/ConfirmMail.xaml.cs b/Views/ConfirmMail.xaml.cs
similarity index 100%
rename from Pages/ConfirmMail.xaml.cs
rename to Views/ConfirmMail.xaml.cs
diff --git a/Pages/CreateRecipePage.xaml b/Views/CreateRecipePage.xaml
similarity index 100%
rename from Pages/CreateRecipePage.xaml
rename to Views/CreateRecipePage.xaml
diff --git a/Pages/CreateRecipePage.xaml.cs b/Views/CreateRecipePage.xaml.cs
similarity index 98%
rename from Pages/CreateRecipePage.xaml.cs
rename to Views/CreateRecipePage.xaml.cs
index 51c2c2d..64b0fd5 100644
--- a/Pages/CreateRecipePage.xaml.cs
+++ b/Views/CreateRecipePage.xaml.cs
@@ -10,16 +10,16 @@ public partial class CreateRecipePage : ContentPage
 	}
 
     private void OnAddIngredientTapped(object sender, TappedEventArgs e)
-    {
+    {
         IngredientList.Children.Add(new IngredientEntry());
-    }
-
+    }
+
     private void OnAddStepTapped(object sender, TappedEventArgs e)
-    {
+    {
         StepList.Children.Add(new StepEntry((uint) StepList.Children.Count() + 1));
     }
-    private async void OnBackButtonClicked(object sender, EventArgs e)
-    {
-        await Navigation.PopAsync();
+    private async void OnBackButtonClicked(object sender, EventArgs e)
+    {
+        await Navigation.PopAsync();
     }
 }
\ No newline at end of file
diff --git a/Pages/FavoritesPage.xaml b/Views/FavoritesPage.xaml
similarity index 100%
rename from Pages/FavoritesPage.xaml
rename to Views/FavoritesPage.xaml
diff --git a/Pages/FavoritesPage.xaml.cs b/Views/FavoritesPage.xaml.cs
similarity index 100%
rename from Pages/FavoritesPage.xaml.cs
rename to Views/FavoritesPage.xaml.cs
diff --git a/Pages/ForgotPassword.xaml b/Views/ForgotPassword.xaml
similarity index 97%
rename from Pages/ForgotPassword.xaml
rename to Views/ForgotPassword.xaml
index 6acca64..54e050b 100644
--- a/Pages/ForgotPassword.xaml
+++ b/Views/ForgotPassword.xaml
@@ -1,171 +1,171 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="ShoopNCook.Pages.ForgotPassword"
-             Title="ForgotPassword"
-             BackgroundColor="{StaticResource BackgroundPrimary}">
-    <ScrollView>
-        <Grid
-            Padding="20"
-            RowDefinitions="Auto, Auto, Auto, *">
-
-            <!-- Profile label and return button -->
-            <Grid
-                Grid.Row="0"
-                RowDefinitions="Auto, *"
-                ColumnDefinitions="*, 1.5*"
-                Margin="0, 0, 0, 40">
-                <HorizontalStackLayout>
-                    <ImageButton 
-                        Grid.Column="0" 
-           
-                        HeightRequest="50"
-                        WidthRequest="50"
-                        Source="arrow_back.svg"
-                        Clicked="OnBackButtonClicked"/>
-                </HorizontalStackLayout>
-                <Label 
-                    Margin="-40,10,0,0"
-                    Grid.Column="1"
-                    FontSize="24"
-                    TextColor="{StaticResource TextColorPrimary}"
-                    Text="Forgot Password"
-                    FontFamily="PoppinsBold"
-                    VerticalOptions="Start"/>
-            </Grid>
-
-            <!-- Email entry -->
-            <Grid
-                Grid.Row="1"
-                RowDefinitions="*, Auto, Auto"
-                >
-
-                <Label 
-                    
-                    Grid.Row="0"
-                    FontSize="15"
-                    TextColor="{StaticResource TextColorSecondary}"
-                    Text="Enter your email here : "
-                    FontFamily="PoppinsBold"
-                    VerticalOptions="Center"/>
-                <Border
-                    Grid.Row="1"
-                    Style="{StaticResource SecondaryBorder}"
-                    Margin="0,30,0,20">
-                        <Grid
-                        Padding="5"
-                        BackgroundColor="{StaticResource BackgroundSecondary}"
-                        ColumnDefinitions="Auto,Auto,*">
-
-                            <Image 
-                            Grid.Column="1"
-                            Source="email_icon.svg">
-                            </Image>
-                            <Entry 
-                            Style="{StaticResource UserInput}"
-                            Grid.Column="2"
-                            Placeholder="User Name"/>
-                        </Grid>
-                    </Border>
-
-                <VerticalStackLayout
-                    Grid.Row="2"
-                    VerticalOptions="End">
-                    <Border
-                        Margin="0, 30, 0, 0"
-                        Stroke="{StaticResource BackgroundPrimary}"
-                        StrokeShape="RoundRectangle 12">
-                        <Button
-                            BackgroundColor="{StaticResource ActionButton}"
-                            FontFamily="PoppinsMedium"
-                            TextColor="White"
-                            Text="Recup my Password"/>
-                    </Border>
-                </VerticalStackLayout>
-            </Grid>
-            <Grid>
-                
-            </Grid>
-            <!-- Sendmail grid -->
-            <Grid
-                Grid.Row="2"
-                RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"
-                RowSpacing="10">
-                <Label 
-                    Grid.Row="0"
-                    Margin="20"
-                    Text="A recuperation code as been send to your email address ! "
-                    FontFamily="PoppinsBold"
-                    TextColor="LightGreen"/>
-                <Label 
-                    Grid.Row="1"
-                    Text="Enter the code here"
-                    FontFamily="PoppinsBold"
-                    TextColor="{StaticResource TextColorSecondary}"/>
-                <Border
-                    Grid.Row="2"
-                    Style="{StaticResource SecondaryBorder}"
-                    >
-                    <Grid
-                        Padding="5"
-                        BackgroundColor="{StaticResource BackgroundSecondary}"
-                        ColumnDefinitions="Auto,Auto,*">
-
-                        <Image 
-                            Grid.Column="1"
-                            Source="code.png">
-                        </Image>
-                        <Entry 
-                            Style="{StaticResource UserInput}"
-                            Grid.Column="2"
-                            Placeholder="Code"/>
-                    </Grid>
-                </Border>
-                <Label 
-                    Grid.Row="3"
-                    Text="Enter new Password here"
-                    FontFamily="PoppinsBold"
-                    TextColor="{StaticResource TextColorSecondary}"/>
-                <Border
-                    Grid.Row="4"
-                    Style="{StaticResource SecondaryBorderShadow}">
-                    <Entry
-                        Style="{StaticResource UserInput}" 
-                        Placeholder="New password"/>
-                </Border>
-                <Label 
-                    Grid.Row="5"
-                    Text="Confirm your new Password here"
-                    FontFamily="PoppinsBold"
-                    TextColor="{StaticResource TextColorSecondary}"/>
-                <Border
-                    Grid.Row="6"
-                    Style="{StaticResource SecondaryBorderShadow}">
-                    <Entry
-                        Style="{StaticResource UserInput}" 
-                        Placeholder="New password"/>
-                </Border>
-            </Grid>
-
-            <!-- Save button -->
-
-            <VerticalStackLayout
-                Grid.Row="3"
-                VerticalOptions="End">
-                <Border
-                    Margin="0, 30, 0, 0"
-                    Stroke="{StaticResource BackgroundPrimary}"
-                    StrokeShape="RoundRectangle 12">
-                    <Button
-                        BackgroundColor="{StaticResource ActionButton}"
-                        FontFamily="PoppinsMedium"
-                        TextColor="White"
-                        Text="Save Change"/>
-                </Border>
-            </VerticalStackLayout>
-
-
-        </Grid>
-
-    </ScrollView>
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="ShoopNCook.Pages.ForgotPassword"
+             Title="ForgotPassword"
+             BackgroundColor="{StaticResource BackgroundPrimary}">
+    <ScrollView>
+        <Grid
+            Padding="20"
+            RowDefinitions="Auto, Auto, Auto, *">
+
+            <!-- Profile label and return button -->
+            <Grid
+                Grid.Row="0"
+                RowDefinitions="Auto, *"
+                ColumnDefinitions="*, 1.5*"
+                Margin="0, 0, 0, 40">
+                <HorizontalStackLayout>
+                    <ImageButton 
+                        Grid.Column="0" 
+           
+                        HeightRequest="50"
+                        WidthRequest="50"
+                        Source="arrow_back.svg"
+                        Clicked="OnBackButtonClicked"/>
+                </HorizontalStackLayout>
+                <Label 
+                    Margin="-40,10,0,0"
+                    Grid.Column="1"
+                    FontSize="24"
+                    TextColor="{StaticResource TextColorPrimary}"
+                    Text="Forgot Password"
+                    FontFamily="PoppinsBold"
+                    VerticalOptions="Start"/>
+            </Grid>
+
+            <!-- Email entry -->
+            <Grid
+                Grid.Row="1"
+                RowDefinitions="*, Auto, Auto"
+                >
+
+                <Label 
+                    
+                    Grid.Row="0"
+                    FontSize="15"
+                    TextColor="{StaticResource TextColorSecondary}"
+                    Text="Enter your email here : "
+                    FontFamily="PoppinsBold"
+                    VerticalOptions="Center"/>
+                <Border
+                    Grid.Row="1"
+                    Style="{StaticResource SecondaryBorder}"
+                    Margin="0,30,0,20">
+                        <Grid
+                        Padding="5"
+                        BackgroundColor="{StaticResource BackgroundSecondary}"
+                        ColumnDefinitions="Auto,Auto,*">
+
+                            <Image 
+                            Grid.Column="1"
+                            Source="email_icon.svg">
+                            </Image>
+                            <Entry 
+                            Style="{StaticResource UserInput}"
+                            Grid.Column="2"
+                            Placeholder="User Name"/>
+                        </Grid>
+                    </Border>
+
+                <VerticalStackLayout
+                    Grid.Row="2"
+                    VerticalOptions="End">
+                    <Border
+                        Margin="0, 30, 0, 0"
+                        Stroke="{StaticResource BackgroundPrimary}"
+                        StrokeShape="RoundRectangle 12">
+                        <Button
+                            BackgroundColor="{StaticResource ActionButton}"
+                            FontFamily="PoppinsMedium"
+                            TextColor="White"
+                            Text="Recup my Password"/>
+                    </Border>
+                </VerticalStackLayout>
+            </Grid>
+            <Grid>
+                
+            </Grid>
+            <!-- Sendmail grid -->
+            <Grid
+                Grid.Row="2"
+                RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"
+                RowSpacing="10">
+                <Label 
+                    Grid.Row="0"
+                    Margin="20"
+                    Text="A recuperation code as been send to your email address ! "
+                    FontFamily="PoppinsBold"
+                    TextColor="LightGreen"/>
+                <Label 
+                    Grid.Row="1"
+                    Text="Enter the code here"
+                    FontFamily="PoppinsBold"
+                    TextColor="{StaticResource TextColorSecondary}"/>
+                <Border
+                    Grid.Row="2"
+                    Style="{StaticResource SecondaryBorder}"
+                    >
+                    <Grid
+                        Padding="5"
+                        BackgroundColor="{StaticResource BackgroundSecondary}"
+                        ColumnDefinitions="Auto,Auto,*">
+
+                        <Image 
+                            Grid.Column="1"
+                            Source="code.png">
+                        </Image>
+                        <Entry 
+                            Style="{StaticResource UserInput}"
+                            Grid.Column="2"
+                            Placeholder="Code"/>
+                    </Grid>
+                </Border>
+                <Label 
+                    Grid.Row="3"
+                    Text="Enter new Password here"
+                    FontFamily="PoppinsBold"
+                    TextColor="{StaticResource TextColorSecondary}"/>
+                <Border
+                    Grid.Row="4"
+                    Style="{StaticResource SecondaryBorderShadow}">
+                    <Entry
+                        Style="{StaticResource UserInput}" 
+                        Placeholder="New password"/>
+                </Border>
+                <Label 
+                    Grid.Row="5"
+                    Text="Confirm your new Password here"
+                    FontFamily="PoppinsBold"
+                    TextColor="{StaticResource TextColorSecondary}"/>
+                <Border
+                    Grid.Row="6"
+                    Style="{StaticResource SecondaryBorderShadow}">
+                    <Entry
+                        Style="{StaticResource UserInput}" 
+                        Placeholder="New password"/>
+                </Border>
+            </Grid>
+
+            <!-- Save button -->
+
+            <VerticalStackLayout
+                Grid.Row="3"
+                VerticalOptions="End">
+                <Border
+                    Margin="0, 30, 0, 0"
+                    Stroke="{StaticResource BackgroundPrimary}"
+                    StrokeShape="RoundRectangle 12">
+                    <Button
+                        BackgroundColor="{StaticResource ActionButton}"
+                        FontFamily="PoppinsMedium"
+                        TextColor="White"
+                        Text="Save Change"/>
+                </Border>
+            </VerticalStackLayout>
+
+
+        </Grid>
+
+    </ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/Pages/ForgotPassword.xaml.cs b/Views/ForgotPassword.xaml.cs
similarity index 95%
rename from Pages/ForgotPassword.xaml.cs
rename to Views/ForgotPassword.xaml.cs
index 7840590..6cb8c7a 100644
--- a/Pages/ForgotPassword.xaml.cs
+++ b/Views/ForgotPassword.xaml.cs
@@ -1,13 +1,13 @@
-namespace ShoopNCook.Pages;
-
-public partial class ForgotPassword : ContentPage
-{
-	public ForgotPassword()
-	{
-		InitializeComponent();
-	}
-    private async void OnBackButtonClicked(object sender, EventArgs e)
-    {
-        await Navigation.PopAsync();
-    }
+namespace ShoopNCook.Pages;
+
+public partial class ForgotPassword : ContentPage
+{
+	public ForgotPassword()
+	{
+		InitializeComponent();
+	}
+    private async void OnBackButtonClicked(object sender, EventArgs e)
+    {
+        await Navigation.PopAsync();
+    }
 }
\ No newline at end of file
diff --git a/Pages/HomePage.xaml b/Views/HomePage.xaml
similarity index 100%
rename from Pages/HomePage.xaml
rename to Views/HomePage.xaml
diff --git a/Pages/HomePage.xaml.cs b/Views/HomePage.xaml.cs
similarity index 100%
rename from Pages/HomePage.xaml.cs
rename to Views/HomePage.xaml.cs
diff --git a/Pages/LoginPage.xaml b/Views/LoginPage.xaml
similarity index 100%
rename from Pages/LoginPage.xaml
rename to Views/LoginPage.xaml
diff --git a/Pages/LoginPage.xaml.cs b/Views/LoginPage.xaml.cs
similarity index 100%
rename from Pages/LoginPage.xaml.cs
rename to Views/LoginPage.xaml.cs
diff --git a/Pages/MorePage.xaml b/Views/MorePage.xaml
similarity index 100%
rename from Pages/MorePage.xaml
rename to Views/MorePage.xaml
diff --git a/Pages/MorePage.xaml.cs b/Views/MorePage.xaml.cs
similarity index 100%
rename from Pages/MorePage.xaml.cs
rename to Views/MorePage.xaml.cs
diff --git a/Pages/MyListPage.xaml b/Views/MyListPage.xaml
similarity index 100%
rename from Pages/MyListPage.xaml
rename to Views/MyListPage.xaml
diff --git a/Pages/MyListPage.xaml.cs b/Views/MyListPage.xaml.cs
similarity index 100%
rename from Pages/MyListPage.xaml.cs
rename to Views/MyListPage.xaml.cs
diff --git a/Pages/MyRecipesPage.xaml b/Views/MyRecipesPage.xaml
similarity index 100%
rename from Pages/MyRecipesPage.xaml
rename to Views/MyRecipesPage.xaml
diff --git a/Pages/MyRecipesPage.xaml.cs b/Views/MyRecipesPage.xaml.cs
similarity index 100%
rename from Pages/MyRecipesPage.xaml.cs
rename to Views/MyRecipesPage.xaml.cs
diff --git a/Pages/ProfilePage.xaml b/Views/ProfilePage.xaml
similarity index 100%
rename from Pages/ProfilePage.xaml
rename to Views/ProfilePage.xaml
diff --git a/Pages/ProfilePage.xaml.cs b/Views/ProfilePage.xaml.cs
similarity index 100%
rename from Pages/ProfilePage.xaml.cs
rename to Views/ProfilePage.xaml.cs
diff --git a/Pages/RecipePage.xaml b/Views/RecipePage.xaml
similarity index 100%
rename from Pages/RecipePage.xaml
rename to Views/RecipePage.xaml
diff --git a/Pages/RecipePage.xaml.cs b/Views/RecipePage.xaml.cs
similarity index 100%
rename from Pages/RecipePage.xaml.cs
rename to Views/RecipePage.xaml.cs
diff --git a/Pages/RegisterPage.xaml b/Views/RegisterPage.xaml
similarity index 100%
rename from Pages/RegisterPage.xaml
rename to Views/RegisterPage.xaml
diff --git a/Pages/RegisterPage.xaml.cs b/Views/RegisterPage.xaml.cs
similarity index 100%
rename from Pages/RegisterPage.xaml.cs
rename to Views/RegisterPage.xaml.cs
diff --git a/Pages/SearchPage.xaml b/Views/SearchPage.xaml
similarity index 100%
rename from Pages/SearchPage.xaml
rename to Views/SearchPage.xaml
diff --git a/Pages/SearchPage.xaml.cs b/Views/SearchPage.xaml.cs
similarity index 100%
rename from Pages/SearchPage.xaml.cs
rename to Views/SearchPage.xaml.cs
diff --git a/Pages/Splash.xaml b/Views/Splash.xaml
similarity index 100%
rename from Pages/Splash.xaml
rename to Views/Splash.xaml
diff --git a/Pages/Splash.xaml.cs b/Views/Splash.xaml.cs
similarity index 100%
rename from Pages/Splash.xaml.cs
rename to Views/Splash.xaml.cs