diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/App.xaml.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/App.xaml.cs
index 0c112e9..05cc51f 100644
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/App.xaml.cs
+++ b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/App.xaml.cs
@@ -1,9 +1,6 @@
 using System;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
-using SafeMessageStorage.Services;
-using SafeMessageStorage.Views;
-
 namespace SafeMessageStorage
 {
     public partial class App : Application
@@ -12,8 +9,6 @@ namespace SafeMessageStorage
         public App()
         {
             InitializeComponent();
-
-            DependencyService.Register<MockDataStore>();
             MainPage = new AppShell();
         }
 
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/AppShell.xaml b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/AppShell.xaml
index 509b9be..c37d2ee 100644
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/AppShell.xaml
+++ b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/AppShell.xaml
@@ -4,69 +4,10 @@
        xmlns:d="http://xamarin.com/schemas/2014/forms/design"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        mc:Ignorable="d"
-       xmlns:local="clr-namespace:SafeMessageStorage.Views"
+       xmlns:pages="clr-namespace:SafeMessageStorage.Pages;assembly=SafeMessageStorage"
        Title="SafeMessageStorage"
        x:Class="SafeMessageStorage.AppShell">
-
-    <!-- 
-        Styles and Resources 
-    -->
-    <Shell.Resources>
-        <ResourceDictionary>
-            <Color x:Key="NavigationPrimary">#2196F3</Color>
-            <Style x:Key="BaseStyle" TargetType="Element">
-                <Setter Property="Shell.BackgroundColor" Value="{StaticResource NavigationPrimary}" />
-                <Setter Property="Shell.ForegroundColor" Value="White" />
-                <Setter Property="Shell.TitleColor" Value="White" />
-                <Setter Property="Shell.DisabledColor" Value="#B4FFFFFF" />
-                <Setter Property="Shell.UnselectedColor" Value="#95FFFFFF" />
-                <Setter Property="Shell.TabBarBackgroundColor" Value="{StaticResource NavigationPrimary}" />
-                <Setter Property="Shell.TabBarForegroundColor" Value="White"/>
-                <Setter Property="Shell.TabBarUnselectedColor" Value="#95FFFFFF"/>
-                <Setter Property="Shell.TabBarTitleColor" Value="White"/>
-            </Style>
-            <Style TargetType="TabBar" BasedOn="{StaticResource BaseStyle}" />
-        </ResourceDictionary>
-    </Shell.Resources>
-
-    <!-- Your Pages -->
-    <TabBar>
-        <Tab Title="Browse" Icon="tab_feed.png">
-            <ShellContent ContentTemplate="{DataTemplate local:ItemsPage}" />
-        </Tab>
-        <Tab Title="About" Icon="tab_about.png">
-            <ShellContent ContentTemplate="{DataTemplate local:AboutPage}" />
-        </Tab>
-    </TabBar>
-
-    <!-- Optional Templates 
-    // These may be provided inline as below or as separate classes.
-
-    // This header appears at the top of the Flyout.
-    <Shell.FlyoutHeaderTemplate>
-        <DataTemplate>
-            <Grid>ContentHere</Grid>
-        </DataTemplate>
-    </Shell.FlyoutHeaderTemplate>
-
-    // ItemTemplate is for ShellItems as displayed in a Flyout
-    <Shell.ItemTemplate>
-        <DataTemplate>
-            <ContentView>
-                Bindable Properties: Title, Icon
-            </ContentView>
-        </DataTemplate>
-    </Shell.ItemTemplate>
-
-    // MenuItemTemplate is for MenuItems as displayed in a Flyout
-    <Shell.MenuItemTemplate>
-        <DataTemplate>
-            <ContentView>
-                Bindable Properties: Text, Icon
-            </ContentView>
-        </DataTemplate>
-    </Shell.MenuItemTemplate>
-
-    -->
-
+    <ShellItem>
+        <ShellContent Title="Authorize"  ContentTemplate ="{DataTemplate pages:AuthorizationPage}"></ShellContent>
+    </ShellItem>
 </Shell>
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Models/Item.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Models/Item.cs
deleted file mode 100644
index 9497f8c..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Models/Item.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace SafeMessageStorage.Models
-{
-    public class Item
-    {
-        public string Id { get; set; }
-        public string Text { get; set; }
-        public string Description { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Pages/AuthorizationPage.xaml b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Pages/AuthorizationPage.xaml
new file mode 100644
index 0000000..e98aaa2
--- /dev/null
+++ b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Pages/AuthorizationPage.xaml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d"
+             x:Class="SafeMessageStorage.Pages.AuthorizationPage"
+             Title="Authorize">
+    <ContentPage.Content>
+        <StackLayout>
+            <Label Text="Welcome to AuthorizationPage!"
+                VerticalOptions="CenterAndExpand" 
+                HorizontalOptions="CenterAndExpand" />
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Pages/AuthorizationPage.xaml.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Pages/AuthorizationPage.xaml.cs
new file mode 100644
index 0000000..d961f7e
--- /dev/null
+++ b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Pages/AuthorizationPage.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace SafeMessageStorage.Pages
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class AuthorizationPage : ContentPage
+    {
+        public AuthorizationPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage.csproj b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage.csproj
index c6457b8..eaf1d65 100644
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage.csproj
+++ b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage.csproj
@@ -9,4 +9,17 @@
     <PackageReference Include="Xamarin.Forms" Version="4.3.0.908675" />  
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Models\" />
+    <Folder Include="Services\" />
+    <Folder Include="ViewModels\" />
+    <Folder Include="Views\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Pages\AuthorizationPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Services/IDataStore.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Services/IDataStore.cs
deleted file mode 100644
index 4b0f58b..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Services/IDataStore.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace SafeMessageStorage.Services
-{
-    public interface IDataStore<T>
-    {
-        Task<bool> AddItemAsync(T item);
-        Task<bool> UpdateItemAsync(T item);
-        Task<bool> DeleteItemAsync(string id);
-        Task<T> GetItemAsync(string id);
-        Task<IEnumerable<T>> GetItemsAsync(bool forceRefresh = false);
-    }
-}
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Services/MockDataStore.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Services/MockDataStore.cs
deleted file mode 100644
index 26009ca..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Services/MockDataStore.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using SafeMessageStorage.Models;
-
-namespace SafeMessageStorage.Services
-{
-    public class MockDataStore : IDataStore<Item>
-    {
-        readonly List<Item> items;
-
-        public MockDataStore()
-        {
-            items = new List<Item>()
-            {
-                new Item { Id = Guid.NewGuid().ToString(), Text = "First item", Description="This is an item description." },
-                new Item { Id = Guid.NewGuid().ToString(), Text = "Second item", Description="This is an item description." },
-                new Item { Id = Guid.NewGuid().ToString(), Text = "Third item", Description="This is an item description." },
-                new Item { Id = Guid.NewGuid().ToString(), Text = "Fourth item", Description="This is an item description." },
-                new Item { Id = Guid.NewGuid().ToString(), Text = "Fifth item", Description="This is an item description." },
-                new Item { Id = Guid.NewGuid().ToString(), Text = "Sixth item", Description="This is an item description." }
-            };
-        }
-
-        public async Task<bool> AddItemAsync(Item item)
-        {
-            items.Add(item);
-
-            return await Task.FromResult(true);
-        }
-
-        public async Task<bool> UpdateItemAsync(Item item)
-        {
-            var oldItem = items.Where((Item arg) => arg.Id == item.Id).FirstOrDefault();
-            items.Remove(oldItem);
-            items.Add(item);
-
-            return await Task.FromResult(true);
-        }
-
-        public async Task<bool> DeleteItemAsync(string id)
-        {
-            var oldItem = items.Where((Item arg) => arg.Id == id).FirstOrDefault();
-            items.Remove(oldItem);
-
-            return await Task.FromResult(true);
-        }
-
-        public async Task<Item> GetItemAsync(string id)
-        {
-            return await Task.FromResult(items.FirstOrDefault(s => s.Id == id));
-        }
-
-        public async Task<IEnumerable<Item>> GetItemsAsync(bool forceRefresh = false)
-        {
-            return await Task.FromResult(items);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/AboutViewModel.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/AboutViewModel.cs
deleted file mode 100644
index 19cd556..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/AboutViewModel.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Windows.Input;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-
-namespace SafeMessageStorage.ViewModels
-{
-    public class AboutViewModel : BaseViewModel
-    {
-        public AboutViewModel()
-        {
-            Title = "About";
-            OpenWebCommand = new Command(async () => await Browser.OpenAsync("https://xamarin.com"));
-        }
-
-        public ICommand OpenWebCommand { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/BaseViewModel.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/BaseViewModel.cs
deleted file mode 100644
index aacb4cd..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/BaseViewModel.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-
-using Xamarin.Forms;
-
-using SafeMessageStorage.Models;
-using SafeMessageStorage.Services;
-
-namespace SafeMessageStorage.ViewModels
-{
-    public class BaseViewModel : INotifyPropertyChanged
-    {
-        public IDataStore<Item> DataStore => DependencyService.Get<IDataStore<Item>>();
-
-        bool isBusy = false;
-        public bool IsBusy
-        {
-            get { return isBusy; }
-            set { SetProperty(ref isBusy, value); }
-        }
-
-        string title = string.Empty;
-        public string Title
-        {
-            get { return title; }
-            set { SetProperty(ref title, value); }
-        }
-
-        protected bool SetProperty<T>(ref T backingStore, T value,
-            [CallerMemberName]string propertyName = "",
-            Action onChanged = null)
-        {
-            if (EqualityComparer<T>.Default.Equals(backingStore, value))
-                return false;
-
-            backingStore = value;
-            onChanged?.Invoke();
-            OnPropertyChanged(propertyName);
-            return true;
-        }
-
-        #region INotifyPropertyChanged
-        public event PropertyChangedEventHandler PropertyChanged;
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = "")
-        {
-            var changed = PropertyChanged;
-            if (changed == null)
-                return;
-
-            changed.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-        #endregion
-    }
-}
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/ItemDetailViewModel.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/ItemDetailViewModel.cs
deleted file mode 100644
index 3b61d64..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/ItemDetailViewModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-using SafeMessageStorage.Models;
-
-namespace SafeMessageStorage.ViewModels
-{
-    public class ItemDetailViewModel : BaseViewModel
-    {
-        public Item Item { get; set; }
-        public ItemDetailViewModel(Item item = null)
-        {
-            Title = item?.Text;
-            Item = item;
-        }
-    }
-}
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/ItemsViewModel.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/ItemsViewModel.cs
deleted file mode 100644
index 17efa62..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/ViewModels/ItemsViewModel.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Threading.Tasks;
-
-using Xamarin.Forms;
-
-using SafeMessageStorage.Models;
-using SafeMessageStorage.Views;
-
-namespace SafeMessageStorage.ViewModels
-{
-    public class ItemsViewModel : BaseViewModel
-    {
-        public ObservableCollection<Item> Items { get; set; }
-        public Command LoadItemsCommand { get; set; }
-
-        public ItemsViewModel()
-        {
-            Title = "Browse";
-            Items = new ObservableCollection<Item>();
-            LoadItemsCommand = new Command(async () => await ExecuteLoadItemsCommand());
-
-            MessagingCenter.Subscribe<NewItemPage, Item>(this, "AddItem", async (obj, item) =>
-            {
-                var newItem = item as Item;
-                Items.Add(newItem);
-                await DataStore.AddItemAsync(newItem);
-            });
-        }
-
-        async Task ExecuteLoadItemsCommand()
-        {
-            if (IsBusy)
-                return;
-
-            IsBusy = true;
-
-            try
-            {
-                Items.Clear();
-                var items = await DataStore.GetItemsAsync(true);
-                foreach (var item in items)
-                {
-                    Items.Add(item);
-                }
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine(ex);
-            }
-            finally
-            {
-                IsBusy = false;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/AboutPage.xaml b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/AboutPage.xaml
deleted file mode 100644
index ab98a2c..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/AboutPage.xaml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="SafeMessageStorage.Views.AboutPage"
-             xmlns:vm="clr-namespace:SafeMessageStorage.ViewModels"
-             Title="{Binding Title}">
-    
-    <ContentPage.BindingContext>
-        <vm:AboutViewModel />
-    </ContentPage.BindingContext>
-    
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <Color x:Key="Primary">#2196F3</Color>
-            <Color x:Key="Accent">#96d1ff</Color>
-            <Color x:Key="LightTextColor">#999999</Color>
-        </ResourceDictionary>
-    </ContentPage.Resources>
-
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <StackLayout BackgroundColor="{StaticResource Accent}" VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
-            <StackLayout Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center">
-                <ContentView Padding="0,40,0,40" VerticalOptions="FillAndExpand">
-                    <Image Source="xamarin_logo.png" VerticalOptions="Center" HeightRequest="64" />
-                </ContentView>
-            </StackLayout>
-        </StackLayout>
-        <ScrollView Grid.Row="1">
-            <StackLayout Orientation="Vertical" Padding="16,40,16,40" Spacing="10">
-                <Label FontSize="22">
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <FormattedString.Spans>
-                                <Span Text="AppName" FontAttributes="Bold" FontSize="22" />
-                                <Span Text=" " />
-                                <Span Text="1.0" ForegroundColor="{StaticResource LightTextColor}" />
-                            </FormattedString.Spans>
-                        </FormattedString>
-                    </Label.FormattedText>
-                </Label>
-                <Label>
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <FormattedString.Spans>
-                                <Span Text="This app is written in C# and native APIs using the" />
-                                <Span Text=" " />
-                                <Span Text="Xamarin Platform" FontAttributes="Bold" />
-                                <Span Text="." />
-                            </FormattedString.Spans>
-                        </FormattedString>
-                    </Label.FormattedText>
-                </Label>
-                <Label>
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <FormattedString.Spans>
-                                <Span Text="It shares code with its" />
-                                <Span Text=" " />
-                                <Span Text="iOS, Android, and Windows" FontAttributes="Bold" />
-                                <Span Text=" " />
-                                <Span Text="versions." />
-                            </FormattedString.Spans>
-                        </FormattedString>
-                    </Label.FormattedText>
-                </Label>
-                <Button Margin="0,10,0,0" Text="Learn more"
-                        Command="{Binding OpenWebCommand}"
-                        BackgroundColor="{StaticResource Primary}"
-                        TextColor="White" />
-            </StackLayout>
-        </ScrollView>
-    </Grid>
-    
-</ContentPage>
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/AboutPage.xaml.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/AboutPage.xaml.cs
deleted file mode 100644
index d993a93..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/AboutPage.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.ComponentModel;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace SafeMessageStorage.Views
-{
-    // Learn more about making custom code visible in the Xamarin.Forms previewer
-    // by visiting https://aka.ms/xamarinforms-previewer
-    [DesignTimeVisible(false)]
-    public partial class AboutPage : ContentPage
-    {
-        public AboutPage()
-        {
-            InitializeComponent();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemDetailPage.xaml b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemDetailPage.xaml
deleted file mode 100644
index 74a576f..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemDetailPage.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="SafeMessageStorage.Views.ItemDetailPage"
-             Title="{Binding Title}">
-
-    <StackLayout Spacing="20" Padding="15">
-        <Label Text="Text:" FontSize="Medium" />
-        <Label Text="{Binding Item.Text}" d:Text="Item name" FontSize="Small"/>
-        <Label Text="Description:" FontSize="Medium" />
-        <Label Text="{Binding Item.Description}" d:Text="Item description" FontSize="Small"/>
-    </StackLayout>
-    
-</ContentPage>
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemDetailPage.xaml.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemDetailPage.xaml.cs
deleted file mode 100644
index 752c468..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemDetailPage.xaml.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.ComponentModel;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-using SafeMessageStorage.Models;
-using SafeMessageStorage.ViewModels;
-
-namespace SafeMessageStorage.Views
-{
-    // Learn more about making custom code visible in the Xamarin.Forms previewer
-    // by visiting https://aka.ms/xamarinforms-previewer
-    [DesignTimeVisible(false)]
-    public partial class ItemDetailPage : ContentPage
-    {
-        ItemDetailViewModel viewModel;
-
-        public ItemDetailPage(ItemDetailViewModel viewModel)
-        {
-            InitializeComponent();
-
-            BindingContext = this.viewModel = viewModel;
-        }
-
-        public ItemDetailPage()
-        {
-            InitializeComponent();
-
-            var item = new Item
-            {
-                Text = "Item 1",
-                Description = "This is an item description."
-            };
-
-            viewModel = new ItemDetailViewModel(item);
-            BindingContext = viewModel;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemsPage.xaml b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemsPage.xaml
deleted file mode 100644
index 39544f5..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemsPage.xaml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="SafeMessageStorage.Views.ItemsPage"
-             Title="{Binding Title}"
-             x:Name="BrowseItemsPage">
-
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="Add" Clicked="AddItem_Clicked" />
-    </ContentPage.ToolbarItems>
-
-    <StackLayout>
-        <ListView x:Name="ItemsListView"
-                ItemsSource="{Binding Items}"
-                VerticalOptions="FillAndExpand"
-                HasUnevenRows="true"
-                RefreshCommand="{Binding LoadItemsCommand}"
-                IsPullToRefreshEnabled="true"
-                IsRefreshing="{Binding IsBusy, Mode=OneWay}"
-                CachingStrategy="RecycleElement"
-                ItemSelected="OnItemSelected">
-            <d:ListView.ItemsSource>
-                <x:Array Type="{x:Type x:String}">
-                    <x:String>First Item</x:String>
-                    <x:String>Second Item</x:String>
-                    <x:String>Third Item</x:String>
-                    <x:String>Fourth Item</x:String>
-                    <x:String>Fifth Item</x:String>
-                    <x:String>Sixth Item</x:String>
-                </x:Array>
-            </d:ListView.ItemsSource>
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <ViewCell>
-                        <StackLayout Padding="10">
-                            <Label Text="{Binding Text}" 
-                                d:Text="{Binding .}"
-                                LineBreakMode="NoWrap" 
-                                Style="{DynamicResource ListItemTextStyle}" 
-                                FontSize="16" />
-                            <Label Text="{Binding Description}" 
-                                d:Text="Item description"
-                                LineBreakMode="NoWrap"
-                                Style="{DynamicResource ListItemDetailTextStyle}"
-                                FontSize="13" />
-                        </StackLayout>
-                    </ViewCell>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </StackLayout>
-
-</ContentPage>
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemsPage.xaml.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemsPage.xaml.cs
deleted file mode 100644
index 585089d..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/ItemsPage.xaml.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-using SafeMessageStorage.Models;
-using SafeMessageStorage.Views;
-using SafeMessageStorage.ViewModels;
-
-namespace SafeMessageStorage.Views
-{
-    // Learn more about making custom code visible in the Xamarin.Forms previewer
-    // by visiting https://aka.ms/xamarinforms-previewer
-    [DesignTimeVisible(false)]
-    public partial class ItemsPage : ContentPage
-    {
-        ItemsViewModel viewModel;
-
-        public ItemsPage()
-        {
-            InitializeComponent();
-
-            BindingContext = viewModel = new ItemsViewModel();
-        }
-
-        async void OnItemSelected(object sender, SelectedItemChangedEventArgs args)
-        {
-            var item = args.SelectedItem as Item;
-            if (item == null)
-                return;
-
-            await Navigation.PushAsync(new ItemDetailPage(new ItemDetailViewModel(item)));
-
-            // Manually deselect item.
-            ItemsListView.SelectedItem = null;
-        }
-
-        async void AddItem_Clicked(object sender, EventArgs e)
-        {
-            await Navigation.PushModalAsync(new NavigationPage(new NewItemPage()));
-        }
-
-        protected override void OnAppearing()
-        {
-            base.OnAppearing();
-
-            if (viewModel.Items.Count == 0)
-                viewModel.LoadItemsCommand.Execute(null);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/NewItemPage.xaml b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/NewItemPage.xaml
deleted file mode 100644
index 15d2d85..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/NewItemPage.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
-             x:Class="SafeMessageStorage.Views.NewItemPage"
-             Title="New Item">
-    
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="Cancel" Clicked="Cancel_Clicked" />
-        <ToolbarItem Text="Save" Clicked="Save_Clicked" />
-    </ContentPage.ToolbarItems>
-    
-    <ContentPage.Content>
-        <StackLayout Spacing="20" Padding="15">
-            <Label Text="Text" FontSize="Medium" />
-            <Entry Text="{Binding Item.Text}" d:Text="Item name" FontSize="Small" />
-            <Label Text="Description" FontSize="Medium" />
-            <Editor Text="{Binding Item.Description}" d:Text="Item description" FontSize="Small" Margin="0" />
-        </StackLayout>
-    </ContentPage.Content>
-    
-</ContentPage>
diff --git a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/NewItemPage.xaml.cs b/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/NewItemPage.xaml.cs
deleted file mode 100644
index 2c0857e..0000000
--- a/src/SafeMessageStorage/SafeMessageStorage/SafeMessageStorage/Views/NewItemPage.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-using SafeMessageStorage.Models;
-
-namespace SafeMessageStorage.Views
-{
-    // Learn more about making custom code visible in the Xamarin.Forms previewer
-    // by visiting https://aka.ms/xamarinforms-previewer
-    [DesignTimeVisible(false)]
-    public partial class NewItemPage : ContentPage
-    {
-        public Item Item { get; set; }
-
-        public NewItemPage()
-        {
-            InitializeComponent();
-
-            Item = new Item
-            {
-                Text = "Item name",
-                Description = "This is an item description."
-            };
-
-            BindingContext = this;
-        }
-
-        async void Save_Clicked(object sender, EventArgs e)
-        {
-            MessagingCenter.Send(this, "AddItem", Item);
-            await Navigation.PopModalAsync();
-        }
-
-        async void Cancel_Clicked(object sender, EventArgs e)
-        {
-            await Navigation.PopModalAsync();
-        }
-    }
-}
\ No newline at end of file