diff --git a/Bitvault.Avalonia/AddVaultContentActionView.axaml b/Bitvault.Avalonia/AddItemActionView.axaml
similarity index 81%
rename from Bitvault.Avalonia/AddVaultContentActionView.axaml
rename to Bitvault.Avalonia/AddItemActionView.axaml
index fb7e283..144a889 100644
--- a/Bitvault.Avalonia/AddVaultContentActionView.axaml
+++ b/Bitvault.Avalonia/AddItemActionView.axaml
@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.AddVaultContentActionView"
+    x:Class="Bitvault.Avalonia.AddItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:AddVaultContentActionViewModel">
+    x:DataType="vm:AddItemActionViewModel">
     <Button
         Grid.Column="1"
         Width="{StaticResource ButtonWidth}"
@@ -15,7 +15,7 @@
         ToolTip.Tip="Add item">
         <Interaction.Behaviors>
             <EventTriggerBehavior EventName="Click">
-                <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="AddVaultContent" />
+                <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="AddItem" />
             </EventTriggerBehavior>
         </Interaction.Behaviors>
     </Button>
diff --git a/Bitvault.Avalonia/AddItemActionView.axaml.cs b/Bitvault.Avalonia/AddItemActionView.axaml.cs
new file mode 100644
index 0000000..b5e7c6d
--- /dev/null
+++ b/Bitvault.Avalonia/AddItemActionView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class AddItemActionView : UserControl
+{
+    public AddItemActionView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/AddVaultContentCommandHeaderView.axaml b/Bitvault.Avalonia/AddItemCommandHeaderView.axaml
similarity index 92%
rename from Bitvault.Avalonia/AddVaultContentCommandHeaderView.axaml
rename to Bitvault.Avalonia/AddItemCommandHeaderView.axaml
index fbc9337..4c6f8ea 100644
--- a/Bitvault.Avalonia/AddVaultContentCommandHeaderView.axaml
+++ b/Bitvault.Avalonia/AddItemCommandHeaderView.axaml
@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.AddVaultContentCommandHeaderView"
+    x:Class="Bitvault.Avalonia.AddItemCommandHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:AddVaultContentCommandHeaderViewModel">
+    x:DataType="vm:AddItemCommandHeaderViewModel">
     <UserControl.Resources>
         <ResourceDictionary>
             <x:Double x:Key="ButtonWidth">40</x:Double>
diff --git a/Bitvault.Avalonia/AddItemCommandHeaderView.axaml.cs b/Bitvault.Avalonia/AddItemCommandHeaderView.axaml.cs
new file mode 100644
index 0000000..44252a0
--- /dev/null
+++ b/Bitvault.Avalonia/AddItemCommandHeaderView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class AddItemCommandHeaderView : UserControl
+{
+    public AddItemCommandHeaderView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/AddVaultContentView.axaml b/Bitvault.Avalonia/AddItemView.axaml
similarity index 85%
rename from Bitvault.Avalonia/AddVaultContentView.axaml
rename to Bitvault.Avalonia/AddItemView.axaml
index f368040..0162740 100644
--- a/Bitvault.Avalonia/AddVaultContentView.axaml
+++ b/Bitvault.Avalonia/AddItemView.axaml
@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.AddVaultContentView"
+    x:Class="Bitvault.Avalonia.AddItemView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:AddVaultContentViewModel">
+    x:DataType="vm:AddItemViewModel">
     <Interaction.Behaviors>
         <EventTriggerBehavior EventName="Loaded">
             <NavigateAction Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}" Route="AddVaultContentCommandHeader" />
diff --git a/Bitvault.Avalonia/AddItemView.axaml.cs b/Bitvault.Avalonia/AddItemView.axaml.cs
new file mode 100644
index 0000000..da8fba7
--- /dev/null
+++ b/Bitvault.Avalonia/AddItemView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class AddItemView : UserControl
+{
+    public AddItemView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/AddVaultContentActionView.axaml.cs b/Bitvault.Avalonia/AddVaultContentActionView.axaml.cs
deleted file mode 100644
index 5337e38..0000000
--- a/Bitvault.Avalonia/AddVaultContentActionView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class AddVaultContentActionView : UserControl
-{
-    public AddVaultContentActionView() => InitializeComponent();
-}
diff --git a/Bitvault.Avalonia/AddVaultContentCommandHeaderView.axaml.cs b/Bitvault.Avalonia/AddVaultContentCommandHeaderView.axaml.cs
deleted file mode 100644
index b4b7ff7..0000000
--- a/Bitvault.Avalonia/AddVaultContentCommandHeaderView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class AddVaultContentCommandHeaderView : UserControl
-{
-    public AddVaultContentCommandHeaderView() => InitializeComponent();
-}
diff --git a/Bitvault.Avalonia/AddVaultContentView.axaml.cs b/Bitvault.Avalonia/AddVaultContentView.axaml.cs
deleted file mode 100644
index b40e72f..0000000
--- a/Bitvault.Avalonia/AddVaultContentView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class AddVaultContentView : UserControl
-{
-    public AddVaultContentView() => InitializeComponent();
-}
diff --git a/Bitvault.Avalonia/AllNavigationView.axaml b/Bitvault.Avalonia/AllNavigationView.axaml
index 35d87e2..f57629f 100644
--- a/Bitvault.Avalonia/AllNavigationView.axaml
+++ b/Bitvault.Avalonia/AllNavigationView.axaml
@@ -14,7 +14,7 @@
                         <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="Vault">
+                <NavigateAction Context="Main" Route="Container">
                     <NavigateAction.ParameterBindings>
                         <ParameterBinding Key="Filter" Value="{Binding Filter}" />
                     </NavigateAction.ParameterBindings>
diff --git a/Bitvault.Avalonia/App.axaml.cs b/Bitvault.Avalonia/App.axaml.cs
index 60d7eaa..b97da95 100644
--- a/Bitvault.Avalonia/App.axaml.cs
+++ b/Bitvault.Avalonia/App.axaml.cs
@@ -23,7 +23,7 @@ public partial class App : Application
     public override async void OnFrameworkInitializationCompleted()
     {
         IHost? host = DefaultHostBuilder.Create()
-            .AddConfiguration<VaultConfiguration>(args => args.Name = "Personal",
+            .AddConfiguration<ContainerConfiguration>(args => args.Name = "Personal",
                    "Vault:*")
             .ConfigureServices((context, services) =>
             {
@@ -35,7 +35,7 @@ public partial class App : Application
                     services.AddTemplate<MainWindowViewModel, MainWindow>("MainWindow");
                 }
 
-                services.AddTransient<IVaultComponent> (provider => Component.Create<VaultComponent>(provider, args =>
+                services.AddTransient<IContainerComponent> (provider => Component.Create<ContainerComponent>(provider, args =>
                 {
                     args.AddServices(services =>
                     {
@@ -46,55 +46,55 @@ public partial class App : Application
                         services.AddTransient<IPasswordHasher, PasswordHasher>();
                         services.AddTransient<IKeyDeriver, KeyDeriver>();
 
-                        services.AddTransient<IVaultKeyFactory, VaultKeyFactory>();
-                        services.AddTransient<IVaultStorage, VaultStorage>();
-                        services.TryAddSingleton<IContainer<VaultKey>, Container<VaultKey>>();
-                        services.TryAddSingleton<IContainer<VaultStorageConnection>, Container<VaultStorageConnection>>();
+                        services.AddTransient<ISecurityKeyFactory, SecurityKeyFactory>();
+                        services.AddTransient<IContainer, ContainerFactory>();
+                        services.TryAddSingleton<IContainer<SecurityKey>, Container<SecurityKey>>();
+                        services.TryAddSingleton<IContainer<ContaienrConnection>, Container<ContaienrConnection>>();
 
                         services.AddDbContextFactory<VaultDbContext>((provider, args) =>
                         {
-                            if (provider.GetRequiredService<IContainer<VaultStorageConnection>>() 
-                                is IContainer<VaultStorageConnection> connection)
+                            if (provider.GetRequiredService<IContainer<ContaienrConnection>>() 
+                                is IContainer<ContaienrConnection> connection)
                             {
                                 args.UseSqlite($"{connection.Value}");
                             }
                         });
 
-                        services.AddHandler<OpenVaultHandler>();
+                        services.AddHandler<OpenContainerHandler>();
 
-                        services.AddTemplate<VaultNavigationViewModel, VaultNavigationView>();
+                        services.AddTemplate<ContainerNavigationViewModel, ContainerNavigationView>();
                         services.AddTemplate<AllNavigationViewModel, AllNavigationView>();
                         services.AddTemplate<StarredNavigationViewModel, StarredNavigationView>();
                         services.AddTemplate<CategoriesNavigationViewModel, CategoriesNavigationView>();
                         services.AddTemplate<ArchiveNavigationViewModel, ArchiveNavigationView>();
 
-                        services.AddTemplate<OpenVaultViewModel, OpenView>("OpenVault");
+                        services.AddTemplate<OpenContainerViewModel, OpenView>("OpenContainer");
 
-                        services.AddTemplate<VaultViewModel, VaultView>("Vault");
-                        services.AddHandler<VaultViewModelHandler>();
+                        services.AddTemplate<ContainerViewModel, ContainerView>("Container");
+                        services.AddHandler<ContainerViewModelHandler>();
 
-                        services.AddTemplate<VaultSearchHeaderViewModel, VaultSearchHeaderView>("VaultSearchHeader");
-                        services.AddTemplate<VaultHeaderViewModel, VaultHeaderView>("VaultHeader");
-                        services.AddTemplate<AddVaultContentActionViewModel, AddVaultContentActionView>();
+                        services.AddTemplate<SearchHeaderViewModel, SearchHeaderView>("SearchHeader");
+                        services.AddTemplate<ContainerHeaderViewModel, ContainerHeaderView>("ContainerHeader");
+                        services.AddTemplate<AddItemActionViewModel, AddItemActionView>();
 
-                        services.AddTemplate<VaultContentNavigationViewModel, VaultContentNavigationView>();
-                        services.AddTemplate<VaultContentViewModel, VaultContentView>("VaultContent");
+                        services.AddTemplate<ItemNavigationViewModel, ItemNavigationView>();
+                        services.AddTemplate<ItemViewModel, ItemView>("AddItem");
 
-                        services.AddTemplate<AddVaultContentViewModel, AddVaultContentView>("AddVaultContent");
-                        services.AddTemplate<AddVaultContentCommandHeaderViewModel, AddVaultContentCommandHeaderView>("AddVaultContentCommandHeader");
+                        services.AddTemplate<AddItemViewModel, AddItemView>("AddAddItem");
+                        services.AddTemplate<AddItemCommandHeaderViewModel, AddItemCommandHeaderView>("AddVaultContentCommandHeader");
 
-                        services.AddTemplate<ConfirmVaultContentActionViewModel, ConfirmVaultContentActionView>();
-                        services.AddTemplate<DismissVaultContentActionViewModel, DismissVaultContentActionView>();
+                        services.AddTemplate<ConfirmItemActionViewModel, ConfirmVaultContentActionView>();
+                        services.AddTemplate<DismissItemActionViewModel, DismissItemActionView>();
 
-                        services.AddTemplate<VaultContentHeaderViewModel, VaultContentHeaderView>();
+                        services.AddTemplate<ItemHeaderViewModel, ItemHeaderView>();
                     });
                 })!);
 
-                services.AddTransient<IVaultComponentFactory,  VaultComponentFactory>();
-                services.AddHandler<CreateVaultHandler>();
+                services.AddTransient<IContainerComponentFactory,  ContainerComponentFactory>();
+                services.AddHandler<CreateContainerHandler>();
 
-                services.AddSingleton<IVaultHostCollection, VaultHostCollection>();
-                services.AddInitializer<VaultCollectionInitializer>();
+                services.AddSingleton<IContainerHostCollection, ContainerHostCollection>();
+                services.AddInitializer<ContainerCollectionInitializer>();
 
                 services.AddTemplate<MainViewModel, MainView>("Main");
                 services.AddHandler<MainViewModelHandler>();
@@ -104,8 +104,8 @@ public partial class App : Application
                 services.AddTemplate<ManageNavigationViewModel, ManageNavigationView>();
                 services.AddTemplate<ManageViewModel, ManageView>("Manage");
 
-                services.AddTemplate<CreateVaultNavigationViewModel, CreateVaultNavigationView>();
-                services.AddTemplate<CreateVaultViewModel, CreateVaultView>("CreateVault");
+                services.AddTemplate<CreateContainerNavigationViewModel, CreateContainerNavigationView>();
+                services.AddTemplate<CreateContainerViewModel, CreateContainerView>("CreateContainer");
             })
         .Build();
 
diff --git a/Bitvault.Avalonia/Bitvault.Avalonia.csproj b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
index 22d7ffd..0faf246 100644
--- a/Bitvault.Avalonia/Bitvault.Avalonia.csproj
+++ b/Bitvault.Avalonia/Bitvault.Avalonia.csproj
@@ -40,14 +40,26 @@
 	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Compile Update="AddVaultContentActionView.axaml.cs">
-	    <DependentUpon>AddVaultContentActionView.axaml</DependentUpon>
+	  <Compile Update="AddItemActionView.axaml.cs">
+	    <DependentUpon>AddItemActionView.axaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="AddVaultContentCommandHeaderView.axaml.cs">
-	    <DependentUpon>AddVaultContentCommandHeaderView.axaml</DependentUpon>
+	  <Compile Update="AddItemCommandHeaderView.axaml.cs">
+	    <DependentUpon>AddItemCommandHeaderView.axaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="VaultContentHeaderView.axaml.cs">
-	    <DependentUpon>VaultContentHeaderView.axaml</DependentUpon>
+	  <Compile Update="AddItemView.axaml.cs">
+	    <DependentUpon>AddItemView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="CreateContainerNavigationView.axaml.cs">
+	    <DependentUpon>CreateContainerNavigationView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="CreateContainerView.axaml.cs">
+	    <DependentUpon>CreateContainerView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="DismissItemActionView.axaml.cs">
+	    <DependentUpon>DismissItemActionView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="ItemHeaderView.axaml.cs">
+	    <DependentUpon>ItemHeaderView.axaml</DependentUpon>
 	  </Compile>
 	  <Compile Update="OpenView.axaml.cs">
 	    <DependentUpon>OpenView.axaml</DependentUpon>
@@ -55,11 +67,23 @@
 	  <Compile Update="ManageNavigationView.axaml.cs">
 	    <DependentUpon>ManageNavigationView.axaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="VaultHeaderView.axaml.cs">
-	    <DependentUpon>VaultHeaderView.axaml</DependentUpon>
+	  <Compile Update="ContainerHeaderView.axaml.cs">
+	    <DependentUpon>ContainerHeaderView.axaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="VaultNavigationView.axaml.cs">
-	    <DependentUpon>VaultNavigationView.axaml</DependentUpon>
+	  <Compile Update="ItemNavigationView.axaml.cs">
+	    <DependentUpon>ItemNavigationView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="ItemView.axaml.cs">
+	    <DependentUpon>ItemView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="ContainerNavigationView.axaml.cs">
+	    <DependentUpon>ContainerNavigationView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="SearchHeaderView.axaml.cs">
+	    <DependentUpon>SearchHeaderView.axaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="ContainerView.axaml.cs">
+	    <DependentUpon>ContainerView.axaml</DependentUpon>
 	  </Compile>
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Bitvault.Avalonia/VaultHeaderView.axaml b/Bitvault.Avalonia/ContainerHeaderView.axaml
similarity index 93%
rename from Bitvault.Avalonia/VaultHeaderView.axaml
rename to Bitvault.Avalonia/ContainerHeaderView.axaml
index 7155e0d..cd17475 100644
--- a/Bitvault.Avalonia/VaultHeaderView.axaml
+++ b/Bitvault.Avalonia/ContainerHeaderView.axaml
@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.VaultHeaderView"
+    x:Class="Bitvault.Avalonia.ContainerHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:VaultHeaderViewModel">
+    x:DataType="vm:ContainerHeaderViewModel">
     <UserControl.Resources>
         <x:Double x:Key="ButtonWidth">40</x:Double>
         <x:Double x:Key="ButtonHeight">36</x:Double>
diff --git a/Bitvault.Avalonia/ContainerHeaderView.axaml.cs b/Bitvault.Avalonia/ContainerHeaderView.axaml.cs
new file mode 100644
index 0000000..f66ffa0
--- /dev/null
+++ b/Bitvault.Avalonia/ContainerHeaderView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ContainerHeaderView : UserControl
+{
+    public ContainerHeaderView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/VaultNavigationView.axaml b/Bitvault.Avalonia/ContainerNavigationView.axaml
similarity index 88%
rename from Bitvault.Avalonia/VaultNavigationView.axaml
rename to Bitvault.Avalonia/ContainerNavigationView.axaml
index 5be01f8..2e662fd 100644
--- a/Bitvault.Avalonia/VaultNavigationView.axaml
+++ b/Bitvault.Avalonia/ContainerNavigationView.axaml
@@ -1,10 +1,10 @@
 <NavigationViewItem
-    x:Class="Bitvault.Avalonia.VaultNavigationView"
+    x:Class="Bitvault.Avalonia.ContainerNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
     x:Name="NavigationViewItem"
-    x:DataType="vm:VaultNavigationViewModel"
+    x:DataType="vm:ContainerNavigationViewModel"
     Content="{Binding Name}"
     IsExpanded="{Binding Expanded}"
     IsSelected="{Binding Selected}"
@@ -19,7 +19,7 @@
                         <ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="OpenVault" />
+                <NavigateAction Context="Main" Route="OpenContainer" />
                 <ChangePropertyAction
                     PropertyName="SelectsOnInvoked"
                     TargetObject="{Binding #NavigationViewItem}"
@@ -33,7 +33,7 @@
                         <ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="Vault" />
+                <NavigateAction Context="Main" Route="Container" />
                 <ChangePropertyAction
                     PropertyName="SelectsOnInvoked"
                     TargetObject="{Binding #NavigationViewItem}"
@@ -48,7 +48,7 @@
                         <ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="OpenVault" />
+                <NavigateAction Context="Main" Route="OpenContainer" />
             </ConditionAction>
             <ConditionAction>
                 <ConditionAction.Condition>
@@ -57,7 +57,7 @@
                         <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Context="Main" Route="Vault" />
+                <NavigateAction Context="Main" Route="Container" />
                 <InvokeNavigationViewItemAction />
             </ConditionAction>
         </AttachedEventTriggerBehaviour>
diff --git a/Bitvault.Avalonia/ContainerNavigationView.axaml.cs b/Bitvault.Avalonia/ContainerNavigationView.axaml.cs
new file mode 100644
index 0000000..67451d0
--- /dev/null
+++ b/Bitvault.Avalonia/ContainerNavigationView.axaml.cs
@@ -0,0 +1,8 @@
+using Toolkit.UI.Controls.Avalonia;
+
+namespace Bitvault.Avalonia;
+
+public partial class ContainerNavigationView : NavigationViewItem
+{
+    public ContainerNavigationView() => InitializeComponent();
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/VaultView.axaml b/Bitvault.Avalonia/ContainerView.axaml
similarity index 95%
rename from Bitvault.Avalonia/VaultView.axaml
rename to Bitvault.Avalonia/ContainerView.axaml
index aa741df..9b18cfd 100644
--- a/Bitvault.Avalonia/VaultView.axaml
+++ b/Bitvault.Avalonia/ContainerView.axaml
@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.VaultView"
+    x:Class="Bitvault.Avalonia.ContainerView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:VaultViewModel">
+    x:DataType="vm:ContainerViewModel">
     <Grid ColumnDefinitions="320,Auto,*" RowDefinitions="Auto,*">
         <ContentControl
             Grid.Row="0"
@@ -12,7 +12,7 @@
             Margin="4,4,0,0">
             <Interaction.Behaviors>
                 <EventTriggerBehavior EventName="Loaded">
-                    <NavigateAction Context="{Binding $self}" Route="VaultHeader" />
+                    <NavigateAction Context="{Binding $self}" Route="ContainerHeader" />
                 </EventTriggerBehavior>
             </Interaction.Behaviors>
         </ContentControl>
diff --git a/Bitvault.Avalonia/ContainerView.axaml.cs b/Bitvault.Avalonia/ContainerView.axaml.cs
new file mode 100644
index 0000000..86067e7
--- /dev/null
+++ b/Bitvault.Avalonia/ContainerView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ContainerView : UserControl
+{
+    public ContainerView() => InitializeComponent();
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/CreateVaultNavigationView.axaml b/Bitvault.Avalonia/CreateContainerNavigationView.axaml
similarity index 81%
rename from Bitvault.Avalonia/CreateVaultNavigationView.axaml
rename to Bitvault.Avalonia/CreateContainerNavigationView.axaml
index 3270fcc..3cc32fd 100644
--- a/Bitvault.Avalonia/CreateVaultNavigationView.axaml
+++ b/Bitvault.Avalonia/CreateContainerNavigationView.axaml
@@ -1,5 +1,5 @@
 <SettingsExpander
-    x:Class="Bitvault.Avalonia.CreateVaultNavigationView"
+    x:Class="Bitvault.Avalonia.CreateContainerNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Description="Keep organized by separating your things into vaults."
@@ -8,7 +8,7 @@
         <Button MinWidth="132" Content="Create vault">
             <Interaction.Behaviors>
                 <EventTriggerBehavior EventName="Click">
-                    <NavigateAction Route="CreateVault" />
+                    <NavigateAction Route="CreateContainer" />
                 </EventTriggerBehavior>
             </Interaction.Behaviors>
         </Button>
diff --git a/Bitvault.Avalonia/CreateContainerNavigationView.axaml.cs b/Bitvault.Avalonia/CreateContainerNavigationView.axaml.cs
new file mode 100644
index 0000000..68948f5
--- /dev/null
+++ b/Bitvault.Avalonia/CreateContainerNavigationView.axaml.cs
@@ -0,0 +1,8 @@
+using Toolkit.UI.Controls.Avalonia;
+
+namespace Bitvault.Avalonia;
+
+public partial class CreateContainerNavigationView : SettingsExpander
+{
+    public CreateContainerNavigationView() => InitializeComponent();
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/CreateVaultView.axaml b/Bitvault.Avalonia/CreateContainerView.axaml
similarity index 88%
rename from Bitvault.Avalonia/CreateVaultView.axaml
rename to Bitvault.Avalonia/CreateContainerView.axaml
index a0be7d8..e53c144 100644
--- a/Bitvault.Avalonia/CreateVaultView.axaml
+++ b/Bitvault.Avalonia/CreateContainerView.axaml
@@ -1,10 +1,10 @@
 <ContentDialog
-    x:Class="Bitvault.Avalonia.CreateVaultView"
+    x:Class="Bitvault.Avalonia.CreateContainerView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
     Title="Create vault"
-    x:DataType="vm:CreateVaultViewModel"
+    x:DataType="vm:CreateContainerViewModel"
     CloseButtonText="Cancel"
     PrimaryButtonText="Create">
     <StackPanel Width="400">
diff --git a/Bitvault.Avalonia/CreateContainerView.axaml.cs b/Bitvault.Avalonia/CreateContainerView.axaml.cs
new file mode 100644
index 0000000..e902acc
--- /dev/null
+++ b/Bitvault.Avalonia/CreateContainerView.axaml.cs
@@ -0,0 +1,8 @@
+using Toolkit.UI.Controls.Avalonia;
+
+namespace Bitvault.Avalonia;
+
+public partial class CreateContainerView : ContentDialog
+{
+    public CreateContainerView() => InitializeComponent();
+}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/CreateVaultNavigationView.axaml.cs b/Bitvault.Avalonia/CreateVaultNavigationView.axaml.cs
deleted file mode 100644
index c83e7e7..0000000
--- a/Bitvault.Avalonia/CreateVaultNavigationView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Toolkit.UI.Controls.Avalonia;
-
-namespace Bitvault.Avalonia;
-
-public partial class CreateVaultNavigationView : SettingsExpander
-{
-    public CreateVaultNavigationView() => InitializeComponent();
-}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/CreateVaultView.axaml.cs b/Bitvault.Avalonia/CreateVaultView.axaml.cs
deleted file mode 100644
index 2e366ac..0000000
--- a/Bitvault.Avalonia/CreateVaultView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Toolkit.UI.Controls.Avalonia;
-
-namespace Bitvault.Avalonia;
-
-public partial class CreateVaultView : ContentDialog
-{
-    public CreateVaultView() => InitializeComponent();
-}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/DismissVaultContentActionView.axaml b/Bitvault.Avalonia/DismissItemActionView.axaml
similarity index 90%
rename from Bitvault.Avalonia/DismissVaultContentActionView.axaml
rename to Bitvault.Avalonia/DismissItemActionView.axaml
index a095d83..a3491a0 100644
--- a/Bitvault.Avalonia/DismissVaultContentActionView.axaml
+++ b/Bitvault.Avalonia/DismissItemActionView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.DismissVaultContentActionView"
+    x:Class="Bitvault.Avalonia.DismissItemActionView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Button
diff --git a/Bitvault.Avalonia/DismissItemActionView.axaml.cs b/Bitvault.Avalonia/DismissItemActionView.axaml.cs
new file mode 100644
index 0000000..2386de9
--- /dev/null
+++ b/Bitvault.Avalonia/DismissItemActionView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class DismissItemActionView : UserControl
+{
+    public DismissItemActionView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/DismissVaultContentActionView.axaml.cs b/Bitvault.Avalonia/DismissVaultContentActionView.axaml.cs
deleted file mode 100644
index c10cdb0..0000000
--- a/Bitvault.Avalonia/DismissVaultContentActionView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class DismissVaultContentActionView : UserControl
-{
-    public DismissVaultContentActionView() => InitializeComponent();
-}
diff --git a/Bitvault.Avalonia/VaultContentHeaderView.axaml b/Bitvault.Avalonia/ItemHeaderView.axaml
similarity index 81%
rename from Bitvault.Avalonia/VaultContentHeaderView.axaml
rename to Bitvault.Avalonia/ItemHeaderView.axaml
index dce941e..0111a7a 100644
--- a/Bitvault.Avalonia/VaultContentHeaderView.axaml
+++ b/Bitvault.Avalonia/ItemHeaderView.axaml
@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.VaultContentHeaderView"
+    x:Class="Bitvault.Avalonia.ItemHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:VaultContentHeaderViewModel">
+    x:DataType="vm:ItemHeaderViewModel">
     <StackPanel Grid.Column="1" Spacing="18">
         <PersonPicture
             Width="96"
diff --git a/Bitvault.Avalonia/ItemHeaderView.axaml.cs b/Bitvault.Avalonia/ItemHeaderView.axaml.cs
new file mode 100644
index 0000000..fd6fc2e
--- /dev/null
+++ b/Bitvault.Avalonia/ItemHeaderView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ItemHeaderView : UserControl
+{
+    public ItemHeaderView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/VaultContentNavigationView.axaml b/Bitvault.Avalonia/ItemNavigationView.axaml
similarity index 84%
rename from Bitvault.Avalonia/VaultContentNavigationView.axaml
rename to Bitvault.Avalonia/ItemNavigationView.axaml
index a51a548..9c4a41a 100644
--- a/Bitvault.Avalonia/VaultContentNavigationView.axaml
+++ b/Bitvault.Avalonia/ItemNavigationView.axaml
@@ -1,14 +1,14 @@
 <ListBoxItem
-    x:Class="Bitvault.Avalonia.VaultContentNavigationView"
+    x:Class="Bitvault.Avalonia.ItemNavigationView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
     x:Name="Name"
     x:CompileBindings="False"
-    x:DataType="vm:VaultContentNavigationViewModel">
+    x:DataType="vm:ItemNavigationViewModel">
     <Interaction.Behaviors>
         <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
-            <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="VaultContent" />
+            <NavigateAction Context="{Binding Named, StringFormat='{}{0}:Content'}" Route="AddItem" />
         </DataTriggerBehavior>
     </Interaction.Behaviors>
     <Grid ColumnDefinitions="Auto,*">
diff --git a/Bitvault.Avalonia/ItemNavigationView.axaml.cs b/Bitvault.Avalonia/ItemNavigationView.axaml.cs
new file mode 100644
index 0000000..c953ba1
--- /dev/null
+++ b/Bitvault.Avalonia/ItemNavigationView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ItemNavigationView : ListBoxItem
+{
+    public ItemNavigationView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/VaultContentView.axaml b/Bitvault.Avalonia/ItemView.axaml
similarity index 76%
rename from Bitvault.Avalonia/VaultContentView.axaml
rename to Bitvault.Avalonia/ItemView.axaml
index 3f98ade..8c4f4d0 100644
--- a/Bitvault.Avalonia/VaultContentView.axaml
+++ b/Bitvault.Avalonia/ItemView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.VaultContentView"
+    x:Class="Bitvault.Avalonia.ItemView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     Vault content placeholder
diff --git a/Bitvault.Avalonia/ItemView.axaml.cs b/Bitvault.Avalonia/ItemView.axaml.cs
new file mode 100644
index 0000000..f549c57
--- /dev/null
+++ b/Bitvault.Avalonia/ItemView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ItemView : UserControl
+{
+    public ItemView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/MainView.axaml b/Bitvault.Avalonia/MainView.axaml
index 5af2000..ffb796d 100644
--- a/Bitvault.Avalonia/MainView.axaml
+++ b/Bitvault.Avalonia/MainView.axaml
@@ -16,7 +16,7 @@
             <Interaction.Behaviors>
                 <EventTriggerBehavior EventName="Loaded">
                     <NavigateRegionAction Name="Main">
-                        <NavigateAction Context="Main" Route="Vault" />
+                        <NavigateAction Context="Main" Route="Container" />
                     </NavigateRegionAction>
                 </EventTriggerBehavior>
             </Interaction.Behaviors>
diff --git a/Bitvault.Avalonia/OpenView.axaml b/Bitvault.Avalonia/OpenView.axaml
index de43728..b90db22 100644
--- a/Bitvault.Avalonia/OpenView.axaml
+++ b/Bitvault.Avalonia/OpenView.axaml
@@ -3,7 +3,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
-    x:DataType="vm:OpenVaultViewModel">
+    x:DataType="vm:OpenContainerViewModel">
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
         <TextBox
             Width="300"
diff --git a/Bitvault.Avalonia/VaultSearchHeaderView.axaml b/Bitvault.Avalonia/SearchHeaderView.axaml
similarity index 77%
rename from Bitvault.Avalonia/VaultSearchHeaderView.axaml
rename to Bitvault.Avalonia/SearchHeaderView.axaml
index 4f723d0..582acf0 100644
--- a/Bitvault.Avalonia/VaultSearchHeaderView.axaml
+++ b/Bitvault.Avalonia/SearchHeaderView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Bitvault.Avalonia.VaultSearchHeaderView"
+    x:Class="Bitvault.Avalonia.SearchHeaderView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <AutoCompleteBox VerticalAlignment="Center" />
diff --git a/Bitvault.Avalonia/SearchHeaderView.axaml.cs b/Bitvault.Avalonia/SearchHeaderView.axaml.cs
new file mode 100644
index 0000000..5ae00f9
--- /dev/null
+++ b/Bitvault.Avalonia/SearchHeaderView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class SearchHeaderView : UserControl
+{
+    public SearchHeaderView() => InitializeComponent();
+}
diff --git a/Bitvault.Avalonia/VaultCommandView.axaml b/Bitvault.Avalonia/VaultCommandView.axaml
deleted file mode 100644
index f21e82c..0000000
--- a/Bitvault.Avalonia/VaultCommandView.axaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<UserControl
-    x:Class="Bitvault.Avalonia.VaultCommandView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    Welcome to Avalonia!
-</UserControl>
diff --git a/Bitvault.Avalonia/VaultCommandView.axaml.cs b/Bitvault.Avalonia/VaultCommandView.axaml.cs
deleted file mode 100644
index 4ded30e..0000000
--- a/Bitvault.Avalonia/VaultCommandView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class VaultCommandView : UserControl
-{
-    public VaultCommandView() => InitializeComponent();
-}
diff --git a/Bitvault.Avalonia/VaultContentHeaderView.axaml.cs b/Bitvault.Avalonia/VaultContentHeaderView.axaml.cs
deleted file mode 100644
index 89e9e07..0000000
--- a/Bitvault.Avalonia/VaultContentHeaderView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class VaultContentHeaderView : UserControl
-{
-    public VaultContentHeaderView() => InitializeComponent();
-}
diff --git a/Bitvault.Avalonia/VaultContentNavigationView.axaml.cs b/Bitvault.Avalonia/VaultContentNavigationView.axaml.cs
deleted file mode 100644
index 6077ca5..0000000
--- a/Bitvault.Avalonia/VaultContentNavigationView.axaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia
-{
-    public partial class VaultContentNavigationView : ListBoxItem
-    {
-        public VaultContentNavigationView()
-        {
-            InitializeComponent();
-            Tapped += VaultContentNavigationView_Tapped;
-        }
-
-        private void VaultContentNavigationView_Tapped(object? sender, global::Avalonia.Input.TappedEventArgs e)
-        {
-
-        }
-    }
-}
diff --git a/Bitvault.Avalonia/VaultContentView.axaml.cs b/Bitvault.Avalonia/VaultContentView.axaml.cs
deleted file mode 100644
index 7f72690..0000000
--- a/Bitvault.Avalonia/VaultContentView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class VaultContentView : UserControl
-{
-    public VaultContentView() => InitializeComponent();
-}
diff --git a/Bitvault.Avalonia/VaultHeaderView.axaml.cs b/Bitvault.Avalonia/VaultHeaderView.axaml.cs
deleted file mode 100644
index f183505..0000000
--- a/Bitvault.Avalonia/VaultHeaderView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class VaultHeaderView : UserControl
-{
-    public VaultHeaderView() => InitializeComponent();
-}
diff --git a/Bitvault.Avalonia/VaultNavigationView.axaml.cs b/Bitvault.Avalonia/VaultNavigationView.axaml.cs
deleted file mode 100644
index f7c42d4..0000000
--- a/Bitvault.Avalonia/VaultNavigationView.axaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Toolkit.UI.Avalonia;
-using Toolkit.UI.Controls.Avalonia;
-
-namespace Bitvault.Avalonia
-{
-    public partial class VaultNavigationView : NavigationViewItem
-    {
-        public VaultNavigationView()
-        {
-            InitializeComponent();
-        }
-
-        public void Test(object? sender, ItemInvokedEventArgs args)
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/Bitvault.Avalonia/VaultSearchHeaderView.axaml.cs b/Bitvault.Avalonia/VaultSearchHeaderView.axaml.cs
deleted file mode 100644
index d612112..0000000
--- a/Bitvault.Avalonia/VaultSearchHeaderView.axaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia
-{
-    public partial class VaultSearchHeaderView : UserControl
-    {
-        public VaultSearchHeaderView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Bitvault.Avalonia/VaultView.axaml.cs b/Bitvault.Avalonia/VaultView.axaml.cs
deleted file mode 100644
index 6411dbd..0000000
--- a/Bitvault.Avalonia/VaultView.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class VaultView : UserControl
-{
-    public VaultView() => InitializeComponent();
-}
\ No newline at end of file
diff --git a/Bitvault/AddVaultContentActionViewModel.cs b/Bitvault/AddItemActionViewModel.cs
similarity index 83%
rename from Bitvault/AddVaultContentActionViewModel.cs
rename to Bitvault/AddItemActionViewModel.cs
index 7f811d7..fb4d563 100644
--- a/Bitvault/AddVaultContentActionViewModel.cs
+++ b/Bitvault/AddItemActionViewModel.cs
@@ -3,7 +3,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public partial class AddVaultContentActionViewModel(IServiceProvider provider,
+public partial class AddItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/AddVaultContentCommandHeaderViewModel.cs b/Bitvault/AddItemCommandHeaderViewModel.cs
similarity index 60%
rename from Bitvault/AddVaultContentCommandHeaderViewModel.cs
rename to Bitvault/AddItemCommandHeaderViewModel.cs
index 3f929f5..662211b 100644
--- a/Bitvault/AddVaultContentCommandHeaderViewModel.cs
+++ b/Bitvault/AddItemCommandHeaderViewModel.cs
@@ -2,9 +2,9 @@
 
 namespace Bitvault;
 
-public partial class AddVaultContentCommandHeaderViewModel : ObservableCollectionViewModel
+public partial class AddItemCommandHeaderViewModel : ObservableCollectionViewModel
 {
-    public AddVaultContentCommandHeaderViewModel(IServiceProvider provider, 
+    public AddItemCommandHeaderViewModel(IServiceProvider provider, 
         IServiceFactory factory,
         IMediator mediator, 
         IPublisher publisher, 
@@ -12,8 +12,8 @@ public partial class AddVaultContentCommandHeaderViewModel : ObservableCollectio
         IDisposer disposer,
         IContentTemplate template) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
-        Add<ConfirmVaultContentActionViewModel>();
-        Add<DismissVaultContentActionViewModel>();
+        Add<ConfirmItemActionViewModel>();
+        Add<DismissItemActionViewModel>();
 
         Template = template;
     }
diff --git a/Bitvault/AddVaultContentViewModel.cs b/Bitvault/AddItemViewModel.cs
similarity index 67%
rename from Bitvault/AddVaultContentViewModel.cs
rename to Bitvault/AddItemViewModel.cs
index 93d29bc..1b2bd7d 100644
--- a/Bitvault/AddVaultContentViewModel.cs
+++ b/Bitvault/AddItemViewModel.cs
@@ -3,13 +3,13 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public partial class AddVaultContentViewModel : 
-    ObservableCollectionViewModel<IVaultContentEntryViewModel>
+public partial class AddItemViewModel : 
+    ObservableCollectionViewModel<IItemViewModel>
 {
     [ObservableProperty]
     private string named;
 
-    public AddVaultContentViewModel(IServiceProvider provider, 
+    public AddItemViewModel(IServiceProvider provider, 
         IServiceFactory factory, 
         IMediator mediator,
         IPublisher publisher, 
@@ -21,15 +21,15 @@ public partial class AddVaultContentViewModel :
         Template = template;
         Named = $"{named}";
 
-        Add<VaultContentHeaderViewModel>();
+        Add<ItemHeaderViewModel>();
     }
 
     public IContentTemplate Template { get; set; }
 
     public Task<bool> Confirm()
     {
-        VaultContentConfiguration configuration = new();
-        foreach (IVaultContentEntryViewModel item in this)
+        ItemConfiguration configuration = new();
+        foreach (IItemViewModel item in this)
         {
             item.Invoke(configuration);
         }
diff --git a/Bitvault/AllNavigationViewModel.cs b/Bitvault/AllNavigationViewModel.cs
index 81701c5..0c80327 100644
--- a/Bitvault/AllNavigationViewModel.cs
+++ b/Bitvault/AllNavigationViewModel.cs
@@ -8,4 +8,4 @@ public partial class AllNavigationViewModel(IServiceProvider provider,
     IPublisher publisher,
     ISubscriber subscriber,
     IDisposer disposer,
-    string filter) : FilterVaultNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, filter);
+    string filter) : FilterContainerNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, filter);
diff --git a/Bitvault/ArchiveNavigationViewModel.cs b/Bitvault/ArchiveNavigationViewModel.cs
index 96467bd..c0541ff 100644
--- a/Bitvault/ArchiveNavigationViewModel.cs
+++ b/Bitvault/ArchiveNavigationViewModel.cs
@@ -8,4 +8,4 @@ public partial class ArchiveNavigationViewModel(IServiceProvider provider,
     IPublisher publisher,
     ISubscriber subscriber,
     IDisposer disposer,
-    string name) : FilterVaultNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
+    string name) : FilterContainerNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
diff --git a/Bitvault/CategoriesNavigationViewModel.cs b/Bitvault/CategoriesNavigationViewModel.cs
index 11182fb..210b2ef 100644
--- a/Bitvault/CategoriesNavigationViewModel.cs
+++ b/Bitvault/CategoriesNavigationViewModel.cs
@@ -8,4 +8,4 @@ public partial class CategoriesNavigationViewModel(IServiceProvider provider,
     IPublisher publisher,
     ISubscriber subscriber,
     IDisposer disposer,
-    string name) : FilterVaultNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
+    string name) : FilterContainerNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
diff --git a/Bitvault/DeleteVaultContentActionViewModel.cs b/Bitvault/ConfirmItemActionViewModel.cs
similarity index 76%
rename from Bitvault/DeleteVaultContentActionViewModel.cs
rename to Bitvault/ConfirmItemActionViewModel.cs
index 8328383..f038ba6 100644
--- a/Bitvault/DeleteVaultContentActionViewModel.cs
+++ b/Bitvault/ConfirmItemActionViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public partial class DeleteVaultContentActionViewModel(IServiceProvider provider,
+public partial class ConfirmItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/VaultStorageConnection.cs b/Bitvault/ContaienrConnection.cs
similarity index 71%
rename from Bitvault/VaultStorageConnection.cs
rename to Bitvault/ContaienrConnection.cs
index 061ff9f..44b2929 100644
--- a/Bitvault/VaultStorageConnection.cs
+++ b/Bitvault/ContaienrConnection.cs
@@ -1,6 +1,6 @@
 namespace Bitvault;
 
-public class VaultStorageConnection(string connection)
+public class ContaienrConnection(string connection)
 {
     private readonly string connection = connection;
 
diff --git a/Bitvault/Vault.cs b/Bitvault/Container.cs
similarity index 61%
rename from Bitvault/Vault.cs
rename to Bitvault/Container.cs
index 3a4bd4d..18007bb 100644
--- a/Bitvault/Vault.cs
+++ b/Bitvault/Container.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public record Vault<TValue>(TValue? Value = default);
+public record SecureStorage<TValue>(TValue? Value = default);
 
 public record Vault
 {
@@ -18,9 +18,9 @@ public record Vault
     }
 
 
-    public static Vault<TValue> As<TValue>(TValue value) => new(value);
+    public static SecureStorage<TValue> As<TValue>(TValue value) => new(value);
 
-    public static Vault<TValue> As<TValue>() where TValue : new() => new(new TValue());
+    public static SecureStorage<TValue> As<TValue>() where TValue : new() => new(new TValue());
 
 
     [MaybeNull]
diff --git a/Bitvault/ContainerCollectionInitializer.cs b/Bitvault/ContainerCollectionInitializer.cs
new file mode 100644
index 0000000..485d449
--- /dev/null
+++ b/Bitvault/ContainerCollectionInitializer.cs
@@ -0,0 +1,21 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public class ContainerCollectionInitializer(IEnumerable<IConfigurationDescriptor<ContainerConfiguration>> configurations,
+    IComponentFactory componentFactory, 
+    IContainerHostCollection vaults) : IInitializer
+{
+    public async Task Initialize()
+    {
+        foreach (IConfigurationDescriptor<ContainerConfiguration> configuration in configurations)
+        {       
+            if (componentFactory.Create<IContainerComponent, ContainerConfiguration>(configuration.Section, configuration.Value) is IComponentHost host)
+            {
+                vaults.Add(host);
+                await host.StartAsync();
+            }
+
+        }
+    }
+}
diff --git a/Bitvault/ContainerComponent.cs b/Bitvault/ContainerComponent.cs
new file mode 100644
index 0000000..3893f3a
--- /dev/null
+++ b/Bitvault/ContainerComponent.cs
@@ -0,0 +1,8 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public class ContainerComponent(IComponentBuilder builder) : Component(builder),
+    IContainerComponent
+{
+}
\ No newline at end of file
diff --git a/Bitvault/ContainerComponentFactory.cs b/Bitvault/ContainerComponentFactory.cs
new file mode 100644
index 0000000..5df67cd
--- /dev/null
+++ b/Bitvault/ContainerComponentFactory.cs
@@ -0,0 +1,18 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public class ContainerComponentFactory(IComponentFactory componentFactory) : 
+    IContainerComponentFactory
+{
+    public IComponentHost? Create(string name)
+    {
+        if (componentFactory.Create<IContainerComponent, ContainerConfiguration>($"Vault:{name}", 
+            new ContainerConfiguration { Name = name }) is IComponentHost host)
+        {
+            return host;
+        }
+
+        return default;
+    }
+}
diff --git a/Bitvault/VaultConfiguration.cs b/Bitvault/ContainerConfiguration.cs
similarity index 67%
rename from Bitvault/VaultConfiguration.cs
rename to Bitvault/ContainerConfiguration.cs
index 7d0d719..27db0ca 100644
--- a/Bitvault/VaultConfiguration.cs
+++ b/Bitvault/ContainerConfiguration.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public record VaultConfiguration : ComponentConfiguration
+public record ContainerConfiguration : ComponentConfiguration
 {
     public string? Name { get; set; }
 
diff --git a/Bitvault/VaultStorage.cs b/Bitvault/ContainerFactory.cs
similarity index 82%
rename from Bitvault/VaultStorage.cs
rename to Bitvault/ContainerFactory.cs
index 8c10f12..b8c7999 100644
--- a/Bitvault/VaultStorage.cs
+++ b/Bitvault/ContainerFactory.cs
@@ -6,15 +6,15 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class VaultStorage(IContainer<VaultStorageConnection> connection,
+public class ContainerFactory(IContainer<ContaienrConnection> connection,
     IHostEnvironment environment,
     IServiceProvider provider) :
-    IVaultStorage
+    IContainer
 {
     public async Task<bool> Create(string name, 
-        VaultKey key)
+        SecurityKey key)
     {
-        connection.Set(new VaultStorageConnection($"Data Source={Path.Combine(environment.ContentRootPath, name)}" +
+        connection.Set(new ContaienrConnection($"Data Source={Path.Combine(environment.ContentRootPath, name)}" +
             $".vault;Mode=ReadWriteCreate;Pooling=false;Password={Convert.ToBase64String(key.DecryptedKey)}"));
 
         IDbContextFactory<VaultDbContext> dbContextFactory = provider.GetRequiredService<IDbContextFactory<VaultDbContext>>();
diff --git a/Bitvault/VaultHeaderViewModel.cs b/Bitvault/ContainerHeaderViewModel.cs
similarity index 65%
rename from Bitvault/VaultHeaderViewModel.cs
rename to Bitvault/ContainerHeaderViewModel.cs
index 79d9b27..8c83c4a 100644
--- a/Bitvault/VaultHeaderViewModel.cs
+++ b/Bitvault/ContainerHeaderViewModel.cs
@@ -2,10 +2,10 @@
 
 namespace Bitvault;
 
-public partial class VaultHeaderViewModel : ObservableCollectionViewModel<string, IDisposable>,
-    INotificationHandler<Vault<Filter<string>>>
+public partial class ContainerHeaderViewModel : ObservableCollectionViewModel<string, IDisposable>,
+    INotificationHandler<SecureStorage<Filter<string>>>
 {
-    public VaultHeaderViewModel(IServiceProvider provider, 
+    public ContainerHeaderViewModel(IServiceProvider provider, 
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
@@ -15,12 +15,12 @@ public partial class VaultHeaderViewModel : ObservableCollectionViewModel<string
     {
         Template = template;
 
-        Add<AddVaultContentActionViewModel>();
+        Add<AddItemActionViewModel>();
     }
 
     public IContentTemplate Template { get; set; }
 
-    public Task Handle(Vault<Filter<string>> args,
+    public Task Handle(SecureStorage<Filter<string>> args,
         CancellationToken cancellationToken = default)
     {
         if (args.Value is Filter<string> filter)
diff --git a/Bitvault/VaultHostCollection.cs b/Bitvault/ContainerHostCollection.cs
similarity index 84%
rename from Bitvault/VaultHostCollection.cs
rename to Bitvault/ContainerHostCollection.cs
index 4465cee..7a1ea32 100644
--- a/Bitvault/VaultHostCollection.cs
+++ b/Bitvault/ContainerHostCollection.cs
@@ -3,8 +3,8 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class VaultHostCollection :
-   IVaultHostCollection
+public class ContainerHostCollection :
+   IContainerHostCollection
 
 {
     private readonly List<IComponentHost> hosts = [];
diff --git a/Bitvault/VaultNavigationViewModel.cs b/Bitvault/ContainerNavigationViewModel.cs
similarity index 71%
rename from Bitvault/VaultNavigationViewModel.cs
rename to Bitvault/ContainerNavigationViewModel.cs
index 8e91d55..fa895ce 100644
--- a/Bitvault/VaultNavigationViewModel.cs
+++ b/Bitvault/ContainerNavigationViewModel.cs
@@ -3,13 +3,13 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public partial class VaultNavigationViewModel :
-    ObservableCollectionViewModel<IVaultNavigationViewModel>,
+public partial class ContainerNavigationViewModel :
+    ObservableCollectionViewModel<IContainerNavigationViewModel>,
     IMainNavigationViewModel,
-    INotificationHandler<Vault<Opened>>,
-    INotificationHandler<Vault<Closed>>,
-    INotificationHandler<Vault<Activated>>,
-    INotificationHandler<Vault<Deactivated>>
+    INotificationHandler<SecureStorage<Opened>>,
+    INotificationHandler<SecureStorage<Closed>>,
+    INotificationHandler<SecureStorage<Activated>>,
+    INotificationHandler<SecureStorage<Deactivated>>
 {
     [ObservableProperty]
     private bool activated;
@@ -26,7 +26,7 @@ public partial class VaultNavigationViewModel :
     [ObservableProperty]
     private bool selected;
 
-    public VaultNavigationViewModel(IServiceProvider provider,
+    public ContainerNavigationViewModel(IServiceProvider provider,
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
@@ -41,7 +41,7 @@ public partial class VaultNavigationViewModel :
 
     public IContentTemplate Template { get; set; }
 
-    public Task Handle(Vault<Opened> args,
+    public Task Handle(SecureStorage<Opened> args,
         CancellationToken cancellationToken = default)
     {
         Add<AllNavigationViewModel>("All");
@@ -53,7 +53,7 @@ public partial class VaultNavigationViewModel :
         return Task.CompletedTask;
     }
 
-    public Task Handle(Vault<Closed> args,
+    public Task Handle(SecureStorage<Closed> args,
         CancellationToken cancellationToken = default)
     {
         Opened = true;
@@ -62,11 +62,11 @@ public partial class VaultNavigationViewModel :
         return Task.CompletedTask;
     }
 
-    public Task Handle(Vault<Deactivated> args,
+    public Task Handle(SecureStorage<Deactivated> args,
         CancellationToken cancellationToken = default) =>
             Task.FromResult(Activated = false);
 
-    public Task Handle(Vault<Activated> args,
+    public Task Handle(SecureStorage<Activated> args,
         CancellationToken cancellationToken = default) =>
             Task.FromResult(Activated = true);
 }
\ No newline at end of file
diff --git a/Bitvault/VaultViewModel.cs b/Bitvault/ContainerViewModel.cs
similarity index 68%
rename from Bitvault/VaultViewModel.cs
rename to Bitvault/ContainerViewModel.cs
index b24143b..4b5d724 100644
--- a/Bitvault/VaultViewModel.cs
+++ b/Bitvault/ContainerViewModel.cs
@@ -4,8 +4,8 @@ using Toolkit.Foundation;
 namespace Bitvault;
 
 
-[Enumerate(nameof(VaultViewModel))]
-public partial class VaultViewModel(IServiceProvider provider,
+[Enumerate(nameof(ContainerViewModel))]
+public partial class ContainerViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
@@ -13,8 +13,8 @@ public partial class VaultViewModel(IServiceProvider provider,
     IDisposer disposer,
     IContentTemplate template,
     NamedComponent named,
-    string? filter = null) : ObservableCollectionViewModel<VaultContentNavigationViewModel>(provider, factory, mediator, publisher, subscriber, disposer),
-    INotificationHandler<Vault<Filter<string>>>
+    string? filter = null) : ObservableCollectionViewModel<ItemNavigationViewModel>(provider, factory, mediator, publisher, subscriber, disposer),
+    INotificationHandler<SecureStorage<Filter<string>>>
 {
     [ObservableProperty]
     private string? filter = filter;
@@ -36,7 +36,7 @@ public partial class VaultViewModel(IServiceProvider provider,
         await base.Deactivated();
     }
 
-        public async Task Handle(Vault<Filter<string>> args,
+        public async Task Handle(SecureStorage<Filter<string>> args,
             CancellationToken cancellationToken = default)
         {
             if (args.Value is Filter<string> filter)
@@ -47,5 +47,5 @@ public partial class VaultViewModel(IServiceProvider provider,
         }
 
         protected override IEnumerate PrepareEnumeration(object? key) =>
-            Enumerate<VaultContentNavigationViewModel>.With(new VaultViewModelOptions { Filter = Filter }) with { Key = key };
+            Enumerate<ItemNavigationViewModel>.With(new ContainerViewModelConfiguration { Filter = Filter }) with { Key = key };
 }
\ No newline at end of file
diff --git a/Bitvault/VaultViewModelOptions.cs b/Bitvault/ContainerViewModelConfiguration.cs
similarity index 59%
rename from Bitvault/VaultViewModelOptions.cs
rename to Bitvault/ContainerViewModelConfiguration.cs
index 1931e05..bb9bfa6 100644
--- a/Bitvault/VaultViewModelOptions.cs
+++ b/Bitvault/ContainerViewModelConfiguration.cs
@@ -1,6 +1,6 @@
 namespace Bitvault;
 
-public record VaultViewModelOptions
+public record ContainerViewModelConfiguration
 {
     public string? Filter { get; set; }
 }
diff --git a/Bitvault/ContainerViewModelHandler.cs b/Bitvault/ContainerViewModelHandler.cs
new file mode 100644
index 0000000..c18c146
--- /dev/null
+++ b/Bitvault/ContainerViewModelHandler.cs
@@ -0,0 +1,48 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public class ContainerViewModelHandler(IServiceFactory factory,
+    IPublisher publisher) :
+    INotificationHandler<Enumerate<ItemNavigationViewModel, ContainerViewModelConfiguration>>
+{
+    public async Task Handle(Enumerate<ItemNavigationViewModel, ContainerViewModelConfiguration> args,
+        CancellationToken cancellationToken = default)
+    {
+        if (args.Options?.Filter is "All")
+        {
+            for (int i = 0; i < 100; i++)
+            {
+                if (factory.Create<ItemNavigationViewModel>("Name " + i, "Description " + 1) is ItemNavigationViewModel viewModel)
+                {
+                    await publisher.Publish(new Create<ItemNavigationViewModel>(viewModel),
+                        nameof(ContainerViewModel), cancellationToken);
+                }
+            }
+        }
+
+        if (args.Options?.Filter is "Starred")
+        {
+            for (int i = 0; i < 10; i++)
+            {
+                if (factory.Create<ItemNavigationViewModel>("Name " + i, "Description " + 1) is ItemNavigationViewModel viewModel)
+                {
+                    await publisher.Publish(new Create<ItemNavigationViewModel>(viewModel),
+                        nameof(ContainerViewModel), cancellationToken);
+                }
+            }
+        }
+
+        if (args.Options?.Filter is "Archive")
+        {
+            for (int i = 0; i < 1000; i++)
+            {
+                if (factory.Create<ItemNavigationViewModel>("Name " + i, "Description " + 1) is ItemNavigationViewModel viewModel)
+                {
+                    await publisher.Publish(new Create<ItemNavigationViewModel>(viewModel),
+                        nameof(ContainerViewModel), cancellationToken);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Bitvault/CreateVaultHandler.cs b/Bitvault/CreateContainerHandler.cs
similarity index 67%
rename from Bitvault/CreateVaultHandler.cs
rename to Bitvault/CreateContainerHandler.cs
index 3b60518..5326c11 100644
--- a/Bitvault/CreateVaultHandler.cs
+++ b/Bitvault/CreateContainerHandler.cs
@@ -5,7 +5,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class CreateVaultHandler(IVaultComponentFactory componentFactory) :
+public class CreateContainerHandler(IContainerComponentFactory componentFactory) :
     IHandler<Create<Vault>, bool>
 {
     public async Task<bool> Handle(Create<Vault> args, 
@@ -16,18 +16,18 @@ public class CreateVaultHandler(IVaultComponentFactory componentFactory) :
         {
             if (componentFactory.Create(name) is IComponentHost host)
             {
-                IVaultKeyFactory keyVaultFactory = host.Services.GetRequiredService<IVaultKeyFactory>();
-                IContainer<VaultKey> vaultKeyContainer = host.Services.GetRequiredService<IContainer<VaultKey>>();
-                IVaultStorage vaultStorage = host.Services.GetRequiredService<IVaultStorage>();
+                ISecurityKeyFactory keyVaultFactory = host.Services.GetRequiredService<ISecurityKeyFactory>();
+                IContainer<SecurityKey> vaultKeyContainer = host.Services.GetRequiredService<IContainer<SecurityKey>>();
+                IContainer vaultStorage = host.Services.GetRequiredService<IContainer>();
 
-                if (keyVaultFactory.Create(Encoding.UTF8.GetBytes(password)) is VaultKey key)
+                if (keyVaultFactory.Create(Encoding.UTF8.GetBytes(password)) is SecurityKey key)
                 {
                     vaultKeyContainer.Set(key);
 
                     if (await vaultStorage.Create(name, key))
                     {
-                        IWritableConfiguration<VaultConfiguration> configuration =
-                            host.Services.GetRequiredService<IWritableConfiguration<VaultConfiguration>>();
+                        IWritableConfiguration<ContainerConfiguration> configuration =
+                            host.Services.GetRequiredService<IWritableConfiguration<ContainerConfiguration>>();
 
                         configuration.Write(args => args.Key = $"{Convert.ToBase64String(key.Salt)}:{Convert.ToBase64String(key.EncryptedKey)}:{Convert.ToBase64String(key.DecryptedKey)}");
                         host.Start();
diff --git a/Bitvault/CreateVaultNavigationViewModel.cs b/Bitvault/CreateContainerNavigationViewModel.cs
similarity index 78%
rename from Bitvault/CreateVaultNavigationViewModel.cs
rename to Bitvault/CreateContainerNavigationViewModel.cs
index 3fb4337..b6f4976 100644
--- a/Bitvault/CreateVaultNavigationViewModel.cs
+++ b/Bitvault/CreateContainerNavigationViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public partial class CreateVaultNavigationViewModel(IServiceProvider provider,
+public partial class CreateContainerNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/CreateVaultViewModel.cs b/Bitvault/CreateContainerViewModel.cs
similarity index 89%
rename from Bitvault/CreateVaultViewModel.cs
rename to Bitvault/CreateContainerViewModel.cs
index d39ed24..e21fd45 100644
--- a/Bitvault/CreateVaultViewModel.cs
+++ b/Bitvault/CreateContainerViewModel.cs
@@ -4,7 +4,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public partial class CreateVaultViewModel(IServiceProvider provider,
+public partial class CreateContainerViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IPublisher publisher,
     IMediator mediator,
diff --git a/Bitvault/ConfirmVaultContentActionViewModel.cs b/Bitvault/DeleteItemActionViewModel.cs
similarity index 76%
rename from Bitvault/ConfirmVaultContentActionViewModel.cs
rename to Bitvault/DeleteItemActionViewModel.cs
index 509ab6a..6d0fc13 100644
--- a/Bitvault/ConfirmVaultContentActionViewModel.cs
+++ b/Bitvault/DeleteItemActionViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public partial class ConfirmVaultContentActionViewModel(IServiceProvider provider,
+public partial class DeleteItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/DismissVaultContentActionViewModel.cs b/Bitvault/DismissItemActionViewModel.cs
similarity index 76%
rename from Bitvault/DismissVaultContentActionViewModel.cs
rename to Bitvault/DismissItemActionViewModel.cs
index b29c9bc..4162260 100644
--- a/Bitvault/DismissVaultContentActionViewModel.cs
+++ b/Bitvault/DismissItemActionViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public partial class DismissVaultContentActionViewModel(IServiceProvider provider,
+public partial class DismissItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/EditVaultContentActionViewModel.cs b/Bitvault/EditItemActionViewModel.cs
similarity index 77%
rename from Bitvault/EditVaultContentActionViewModel.cs
rename to Bitvault/EditItemActionViewModel.cs
index 3f55b72..20bb91f 100644
--- a/Bitvault/EditVaultContentActionViewModel.cs
+++ b/Bitvault/EditItemActionViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public partial class EditVaultContentActionViewModel(IServiceProvider provider,
+public partial class EditItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/FilterVaultNavigationViewModel.cs b/Bitvault/FilterContainerNavigationViewModel.cs
similarity index 69%
rename from Bitvault/FilterVaultNavigationViewModel.cs
rename to Bitvault/FilterContainerNavigationViewModel.cs
index c9e9435..ca7ecbf 100644
--- a/Bitvault/FilterVaultNavigationViewModel.cs
+++ b/Bitvault/FilterContainerNavigationViewModel.cs
@@ -4,10 +4,10 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public partial class FilterVaultNavigationViewModel : ObservableViewModel,
-    IVaultNavigationViewModel,
-    INotificationHandler<Vault<Activated>>,
-    INotificationHandler<Vault<Deactivated>>
+public partial class FilterContainerNavigationViewModel : ObservableViewModel,
+    IContainerNavigationViewModel,
+    INotificationHandler<SecureStorage<Activated>>,
+    INotificationHandler<SecureStorage<Deactivated>>
 {
     [ObservableProperty]
     private bool activated;
@@ -18,7 +18,7 @@ public partial class FilterVaultNavigationViewModel : ObservableViewModel,
     [ObservableProperty]
     private bool selected;
 
-    public FilterVaultNavigationViewModel(IServiceProvider provider,
+    public FilterContainerNavigationViewModel(IServiceProvider provider,
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
@@ -29,11 +29,11 @@ public partial class FilterVaultNavigationViewModel : ObservableViewModel,
         Filter = filter;
     }
 
-    public Task Handle(Vault<Deactivated> args,
+    public Task Handle(SecureStorage<Deactivated> args,
         CancellationToken cancellationToken = default) =>
             Task.FromResult(Activated = false);
 
-    public Task Handle(Vault<Activated> args,
+    public Task Handle(SecureStorage<Activated> args,
         CancellationToken cancellationToken = default) =>
             Task.FromResult(Activated = true);
 
diff --git a/Bitvault/IContainer.cs b/Bitvault/IContainer.cs
new file mode 100644
index 0000000..81f7c09
--- /dev/null
+++ b/Bitvault/IContainer.cs
@@ -0,0 +1,6 @@
+namespace Bitvault;
+
+public interface IContainer
+{
+    Task<bool> Create(string name, SecurityKey key);
+}
\ No newline at end of file
diff --git a/Bitvault/IContainerComponent.cs b/Bitvault/IContainerComponent.cs
new file mode 100644
index 0000000..cd260ac
--- /dev/null
+++ b/Bitvault/IContainerComponent.cs
@@ -0,0 +1,5 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public interface IContainerComponent : IComponent;
diff --git a/Bitvault/IVaultComponentFactory.cs b/Bitvault/IContainerComponentFactory.cs
similarity index 69%
rename from Bitvault/IVaultComponentFactory.cs
rename to Bitvault/IContainerComponentFactory.cs
index b02c55f..53a7cc2 100644
--- a/Bitvault/IVaultComponentFactory.cs
+++ b/Bitvault/IContainerComponentFactory.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault
 {
-    public interface IVaultComponentFactory
+    public interface IContainerComponentFactory
     {
         IComponentHost? Create(string name);
     }
diff --git a/Bitvault/IVaultHost.cs b/Bitvault/IContainerHost.cs
similarity index 51%
rename from Bitvault/IVaultHost.cs
rename to Bitvault/IContainerHost.cs
index 4694865..a596e26 100644
--- a/Bitvault/IVaultHost.cs
+++ b/Bitvault/IContainerHost.cs
@@ -2,4 +2,4 @@
 
 namespace Bitvault;
 
-public interface IVaultHost : IComponentHost;
\ No newline at end of file
+public interface IContainerHost : IComponentHost;
\ No newline at end of file
diff --git a/Bitvault/IVaultHostCollection.cs b/Bitvault/IContainerHostCollection.cs
similarity index 73%
rename from Bitvault/IVaultHostCollection.cs
rename to Bitvault/IContainerHostCollection.cs
index c49ff10..d659ba3 100644
--- a/Bitvault/IVaultHostCollection.cs
+++ b/Bitvault/IContainerHostCollection.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public interface IVaultHostCollection :
+public interface IContainerHostCollection :
     IEnumerable<IComponentHost>
 {
     void Add(IComponentHost host);
diff --git a/Bitvault/IContainerNavigationViewModel.cs b/Bitvault/IContainerNavigationViewModel.cs
new file mode 100644
index 0000000..641cec5
--- /dev/null
+++ b/Bitvault/IContainerNavigationViewModel.cs
@@ -0,0 +1,5 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public interface IContainerNavigationViewModel : ISelectable;
\ No newline at end of file
diff --git a/Bitvault/IItemViewModel.cs b/Bitvault/IItemViewModel.cs
new file mode 100644
index 0000000..36f32ad
--- /dev/null
+++ b/Bitvault/IItemViewModel.cs
@@ -0,0 +1,6 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public interface IItemViewModel : 
+    IValueInvoker<ItemConfiguration>;
diff --git a/Bitvault/IVaultKeyFactory.cs b/Bitvault/ISecurityKeyFactory.cs
similarity index 55%
rename from Bitvault/IVaultKeyFactory.cs
rename to Bitvault/ISecurityKeyFactory.cs
index 34b6c80..1fc2455 100644
--- a/Bitvault/IVaultKeyFactory.cs
+++ b/Bitvault/ISecurityKeyFactory.cs
@@ -1,8 +1,8 @@
 namespace Bitvault;
 
-public interface IVaultKeyFactory
+public interface ISecurityKeyFactory
 {
-    VaultKey? Create(byte[] phrase,
+    SecurityKey? Create(byte[] phrase,
         byte[]? encryptedKey = null,
         byte[]? salt = null);
 }
diff --git a/Bitvault/IVaultComponent.cs b/Bitvault/IVaultComponent.cs
deleted file mode 100644
index 807f210..0000000
--- a/Bitvault/IVaultComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public interface IVaultComponent : IComponent;
-
-public class VaultComponent(IComponentBuilder builder) : Component(builder),
-    IVaultComponent
-{
-}
\ No newline at end of file
diff --git a/Bitvault/IVaultConnectionPersistence.cs b/Bitvault/IVaultConnectionPersistence.cs
deleted file mode 100644
index c1b56b3..0000000
--- a/Bitvault/IVaultConnectionPersistence.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Bitvault
-{
-    public interface IVaultConnectionPersistence
-    {
-        void Dispose();
-        string? Get(string key);
-        void Set(string key, string connection);
-    }
-}
\ No newline at end of file
diff --git a/Bitvault/IVaultContentEntryViewModel.cs b/Bitvault/IVaultContentEntryViewModel.cs
deleted file mode 100644
index a962f56..0000000
--- a/Bitvault/IVaultContentEntryViewModel.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public interface IVaultContentEntryViewModel : 
-    IValueInvoker<VaultContentConfiguration>;
diff --git a/Bitvault/IVaultNavigationViewModel.cs b/Bitvault/IVaultNavigationViewModel.cs
deleted file mode 100644
index 2d6af47..0000000
--- a/Bitvault/IVaultNavigationViewModel.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public interface IVaultNavigationViewModel : ISelectable;
\ No newline at end of file
diff --git a/Bitvault/IVaultStorage.cs b/Bitvault/IVaultStorage.cs
deleted file mode 100644
index 4cf54f0..0000000
--- a/Bitvault/IVaultStorage.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Bitvault;
-
-public interface IVaultStorage
-{
-    Task<bool> Create(string name, VaultKey key);
-}
\ No newline at end of file
diff --git a/Bitvault/VaultContentConfiguration.cs b/Bitvault/ItemConfiguration.cs
similarity index 62%
rename from Bitvault/VaultContentConfiguration.cs
rename to Bitvault/ItemConfiguration.cs
index b824251..41840ea 100644
--- a/Bitvault/VaultContentConfiguration.cs
+++ b/Bitvault/ItemConfiguration.cs
@@ -1,6 +1,6 @@
 namespace Bitvault;
 
-public record VaultContentConfiguration
+public record ItemConfiguration
 {
     public string? Name { get; set; }
 }
diff --git a/Bitvault/VaultContentHeaderViewModel.cs b/Bitvault/ItemHeaderViewModel.cs
similarity index 65%
rename from Bitvault/VaultContentHeaderViewModel.cs
rename to Bitvault/ItemHeaderViewModel.cs
index e60b303..37e4747 100644
--- a/Bitvault/VaultContentHeaderViewModel.cs
+++ b/Bitvault/ItemHeaderViewModel.cs
@@ -2,14 +2,14 @@
 
 namespace Bitvault;
 
-public partial class VaultContentHeaderViewModel(IServiceProvider provider,
+public partial class ItemHeaderViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
     ISubscriber subscriber,
     IDisposer disposer) : ObservableViewModel<string, string>(provider, factory, mediator, publisher, subscriber, disposer),
-    IVaultContentEntryViewModel
+    IItemViewModel
 {
-    public void Invoke(VaultContentConfiguration args) => 
+    public void Invoke(ItemConfiguration args) => 
         args.Name = Value;
 }
diff --git a/Bitvault/VaultContentNavigationViewModel.cs b/Bitvault/ItemNavigationViewModel.cs
similarity index 90%
rename from Bitvault/VaultContentNavigationViewModel.cs
rename to Bitvault/ItemNavigationViewModel.cs
index 086f6ae..4a40816 100644
--- a/Bitvault/VaultContentNavigationViewModel.cs
+++ b/Bitvault/ItemNavigationViewModel.cs
@@ -3,7 +3,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public partial class VaultContentNavigationViewModel(IServiceProvider provider,
+public partial class ItemNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/VaultContentViewModel.cs b/Bitvault/ItemViewModel.cs
similarity index 85%
rename from Bitvault/VaultContentViewModel.cs
rename to Bitvault/ItemViewModel.cs
index 2d15e8f..c4933d8 100644
--- a/Bitvault/VaultContentViewModel.cs
+++ b/Bitvault/ItemViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public class VaultContentViewModel(IServiceProvider provider,
+public class ItemViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/MainViewModelHandler.cs b/Bitvault/MainViewModelHandler.cs
index 49e3e99..364020b 100644
--- a/Bitvault/MainViewModelHandler.cs
+++ b/Bitvault/MainViewModelHandler.cs
@@ -4,7 +4,7 @@ using Toolkit.Foundation;
 namespace Bitvault;
 
 public class MainViewModelHandler(IPublisher publisher,
-    IVaultHostCollection vaults) :
+    IContainerHostCollection vaults) :
     INotificationHandler<Enumerate<IMainNavigationViewModel>>
 {
     public async Task Handle(Enumerate<IMainNavigationViewModel> args,
@@ -12,11 +12,11 @@ public class MainViewModelHandler(IPublisher publisher,
     {
         foreach (IComponentHost vault in vaults)
         {
-            if (vault.Services.GetRequiredService<VaultConfiguration>() is VaultConfiguration configuration)
+            if (vault.Services.GetRequiredService<ContainerConfiguration>() is ContainerConfiguration configuration)
             {
                 if (vault.Services.GetRequiredService<IServiceFactory>() is IServiceFactory factory)
                 {
-                    if (factory.Create<VaultNavigationViewModel>(configuration.Name) is VaultNavigationViewModel viewModel)
+                    if (factory.Create<ContainerNavigationViewModel>(configuration.Name) is ContainerNavigationViewModel viewModel)
                     {
                         await publisher.Publish(new Create<IMainNavigationViewModel>(viewModel),
                             nameof(MainViewModel), cancellationToken);
diff --git a/Bitvault/ManageViewModel.cs b/Bitvault/ManageViewModel.cs
index ced1f64..06d7164 100644
--- a/Bitvault/ManageViewModel.cs
+++ b/Bitvault/ManageViewModel.cs
@@ -16,7 +16,7 @@ public partial class ManageViewModel :
     {
         Template = template;
 
-        Add<CreateVaultNavigationViewModel>();
+        Add<CreateContainerNavigationViewModel>();
     }
 
     public IContentTemplate Template { get; set; }
diff --git a/Bitvault/OpenVaultHandler.cs b/Bitvault/OpenContainerHandler.cs
similarity index 81%
rename from Bitvault/OpenVaultHandler.cs
rename to Bitvault/OpenContainerHandler.cs
index e842c03..ab0709b 100644
--- a/Bitvault/OpenVaultHandler.cs
+++ b/Bitvault/OpenContainerHandler.cs
@@ -3,9 +3,9 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class OpenVaultHandler(VaultConfiguration configuration,
-    IVaultKeyFactory keyVaultFactory,
-    IVaultStorage vaultStorage) :
+public class OpenContainerHandler(ContainerConfiguration configuration,
+    ISecurityKeyFactory keyVaultFactory,
+    IContainer vaultStorage) :
     IHandler<Open<Vault>, bool>
 {
     public async Task<bool> Handle(Open<Vault> args,
@@ -18,7 +18,7 @@ public class OpenVaultHandler(VaultConfiguration configuration,
                 byte[]? salt = Convert.FromBase64String(keyPart[0]);
                 byte[]? encryptedKey = Convert.FromBase64String(keyPart[1]);
 
-                if ( keyVaultFactory.Create(Encoding.UTF8.GetBytes(password), encryptedKey, salt) is VaultKey key)
+                if ( keyVaultFactory.Create(Encoding.UTF8.GetBytes(password), encryptedKey, salt) is SecurityKey key)
                 {
                     if (await vaultStorage.Create(name, key))
                     {
diff --git a/Bitvault/OpenVaultViewModel.cs b/Bitvault/OpenContainerViewModel.cs
similarity index 90%
rename from Bitvault/OpenVaultViewModel.cs
rename to Bitvault/OpenContainerViewModel.cs
index 5b1d38c..f64c1e2 100644
--- a/Bitvault/OpenVaultViewModel.cs
+++ b/Bitvault/OpenContainerViewModel.cs
@@ -4,7 +4,7 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public partial class OpenVaultViewModel(IServiceProvider provider,
+public partial class OpenContainerViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
diff --git a/Bitvault/VaultSearchHeaderViewModel.cs b/Bitvault/SearchHeaderViewModel.cs
similarity index 78%
rename from Bitvault/VaultSearchHeaderViewModel.cs
rename to Bitvault/SearchHeaderViewModel.cs
index 9e2864a..c4f1629 100644
--- a/Bitvault/VaultSearchHeaderViewModel.cs
+++ b/Bitvault/SearchHeaderViewModel.cs
@@ -2,7 +2,7 @@
 
 namespace Bitvault;
 
-public partial class VaultSearchHeaderViewModel(IServiceProvider provider,
+public partial class SearchHeaderViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator, 
     IPublisher publisher,
diff --git a/Bitvault/VaultKey.cs b/Bitvault/SecurityKey.cs
similarity index 77%
rename from Bitvault/VaultKey.cs
rename to Bitvault/SecurityKey.cs
index 5218a35..3ade48a 100644
--- a/Bitvault/VaultKey.cs
+++ b/Bitvault/SecurityKey.cs
@@ -1,6 +1,6 @@
 namespace Bitvault;
 
-public record VaultKey(byte[] Salt, byte[] EncryptedKey, byte[] DecryptedKey) :
+public record SecurityKey(byte[] Salt, byte[] EncryptedKey, byte[] DecryptedKey) :
     IDisposable
 {
     public void Dispose()
diff --git a/Bitvault/VaultKeyFactory.cs b/Bitvault/SecurityKeyFactory.cs
similarity index 78%
rename from Bitvault/VaultKeyFactory.cs
rename to Bitvault/SecurityKeyFactory.cs
index dba3791..91cd386 100644
--- a/Bitvault/VaultKeyFactory.cs
+++ b/Bitvault/SecurityKeyFactory.cs
@@ -2,13 +2,13 @@
 
 namespace Bitvault;
 
-public class VaultKeyFactory(IKeyGenerator generator,
+public class SecurityKeyFactory(IKeyGenerator generator,
     IKeyDeriver deriver,
     IEncryptor encryptor,
     IDecryptor decryptor) : 
-    IVaultKeyFactory
+    ISecurityKeyFactory
 {
-    public VaultKey? Create(byte[] phrase,
+    public SecurityKey? Create(byte[] phrase,
         byte[]? encryptedKey = null,
         byte[]? salt = null)
     {
@@ -28,7 +28,7 @@ public class VaultKeyFactory(IKeyGenerator generator,
             return default;
         }
 
-        return new VaultKey(salt, encryptedKey, decryptedKey);
+        return new SecurityKey(salt, encryptedKey, decryptedKey);
     }
 }
 
diff --git a/Bitvault/StarredNavigationViewModel.cs b/Bitvault/StarredNavigationViewModel.cs
index 8c906fc..4826b5a 100644
--- a/Bitvault/StarredNavigationViewModel.cs
+++ b/Bitvault/StarredNavigationViewModel.cs
@@ -8,4 +8,4 @@ public partial class StarredNavigationViewModel(IServiceProvider provider,
     IPublisher publisher,
     ISubscriber subscriber,
     IDisposer disposer,
-    string name) : FilterVaultNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
+    string name) : FilterContainerNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
diff --git a/Bitvault/VaultCollectionInitializer.cs b/Bitvault/VaultCollectionInitializer.cs
deleted file mode 100644
index a4134b3..0000000
--- a/Bitvault/VaultCollectionInitializer.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public class VaultCollectionInitializer(IEnumerable<IConfigurationDescriptor<VaultConfiguration>> configurations,
-    IComponentFactory componentFactory, 
-    IVaultHostCollection vaults) : IInitializer
-{
-    public async Task Initialize()
-    {
-        foreach (IConfigurationDescriptor<VaultConfiguration> configuration in configurations)
-        {       
-            if (componentFactory.Create<IVaultComponent, VaultConfiguration>(configuration.Section, configuration.Value) is IComponentHost host)
-            {
-                vaults.Add(host);
-                await host.StartAsync();
-            }
-
-        }
-    }
-}
diff --git a/Bitvault/VaultComponentFactory.cs b/Bitvault/VaultComponentFactory.cs
deleted file mode 100644
index 494c9b4..0000000
--- a/Bitvault/VaultComponentFactory.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public class VaultComponentFactory(IComponentFactory componentFactory) : 
-    IVaultComponentFactory
-{
-    public IComponentHost? Create(string name)
-    {
-        if (componentFactory.Create<IVaultComponent, VaultConfiguration>($"Vault:{name}", 
-            new VaultConfiguration { Name = name }) is IComponentHost host)
-        {
-            return host;
-        }
-
-        return default;
-    }
-}
diff --git a/Bitvault/VaultItemViewModel.cs b/Bitvault/VaultItemViewModel.cs
deleted file mode 100644
index 784d38d..0000000
--- a/Bitvault/VaultItemViewModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public class VaultItemViewModel(IServiceProvider provider,
-    IServiceFactory factory,
-    IMediator mediator,
-    IPublisher publisher,
-    ISubscriber subscriber,
-    IDisposer disposer) :
-    ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
\ No newline at end of file
diff --git a/Bitvault/VaultViewModelHandler.cs b/Bitvault/VaultViewModelHandler.cs
deleted file mode 100644
index 45f046e..0000000
--- a/Bitvault/VaultViewModelHandler.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public class VaultViewModelHandler(IServiceFactory factory,
-    IPublisher publisher) :
-    INotificationHandler<Enumerate<VaultContentNavigationViewModel, VaultViewModelOptions>>
-{
-    public async Task Handle(Enumerate<VaultContentNavigationViewModel, VaultViewModelOptions> args,
-        CancellationToken cancellationToken = default)
-    {
-        if (args.Options?.Filter is "All")
-        {
-            for (int i = 0; i < 100; i++)
-            {
-                if (factory.Create<VaultContentNavigationViewModel>("Name " + i, "Description " + 1) is VaultContentNavigationViewModel viewModel)
-                {
-                    await publisher.Publish(new Create<VaultContentNavigationViewModel>(viewModel),
-                        nameof(VaultViewModel), cancellationToken);
-                }
-            }
-        }
-
-        if (args.Options?.Filter is "Starred")
-        {
-            for (int i = 0; i < 10; i++)
-            {
-                if (factory.Create<VaultContentNavigationViewModel>("Name " + i, "Description " + 1) is VaultContentNavigationViewModel viewModel)
-                {
-                    await publisher.Publish(new Create<VaultContentNavigationViewModel>(viewModel),
-                        nameof(VaultViewModel), cancellationToken);
-                }
-            }
-        }
-
-        if (args.Options?.Filter is "Archive")
-        {
-            for (int i = 0; i < 1000; i++)
-            {
-                if (factory.Create<VaultContentNavigationViewModel>("Name " + i, "Description " + 1) is VaultContentNavigationViewModel viewModel)
-                {
-                    await publisher.Publish(new Create<VaultContentNavigationViewModel>(viewModel),
-                        nameof(VaultViewModel), cancellationToken);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file