diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 19383dfa..e60c49ae 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -27,9 +27,9 @@ jobs:
             win-nuget
     - name: Publish Windows
       run: | 
-        ./build.ps1 -Runtime win-x64 -PublishAot -BuildNumber '1.0.${{github.run_number }}'
+        ./src/build.ps1 -Runtime win-x64 -PublishAot -BuildNumber '1.0.${{github.run_number }}'
         New-Item -ItemType Directory -Path "win-x64" 
-        Move-Item -Path ".\publish" -Destination "$env:GITHUB_WORKSPACE\win-x64\publish"
+        Move-Item -Path ".\src\publish" -Destination "$env:GITHUB_WORKSPACE\win-x64\publish"
         gci -path  "$env:GITHUB_WORKSPACE\win-x64\publish"
       shell: pwsh
     - name: Create Package
@@ -57,9 +57,9 @@ jobs:
             winarm-nuget
     - name: Publish Windows
       run: | 
-        ./build.ps1 -Runtime win-arm64 -PublishAot -BuildNumber '1.0.${{github.run_number }}'
+        ./src/build.ps1 -Runtime win-arm64 -PublishAot -BuildNumber '1.0.${{github.run_number }}'
         New-Item -ItemType Directory -Path "win-arm64" 
-        Move-Item -Path ".\publish" -Destination "$env:GITHUB_WORKSPACE\win-arm64\publish"
+        Move-Item -Path ".\src\publish" -Destination "$env:GITHUB_WORKSPACE\win-arm64\publish"
         gci -path  "$env:GITHUB_WORKSPACE\win-arm64\publish"
       shell: pwsh
     - name: Create Package
@@ -87,9 +87,9 @@ jobs:
             #mac-arm-nuget
     - name: Publish macOS Arm
       run: | 
-        ./build.ps1 -Runtime osx-arm64 -PublishAot:$false -BuildNumber '1.0.${{github.run_number }}'      
+        ./src/build.ps1 -Runtime osx-arm64 -PublishAot:$false -BuildNumber '1.0.${{github.run_number }}'      
         New-Item -ItemType Directory -Path "osx-arm64" 
-        Move-Item -Path ".\publish" -Destination "$env:GITHUB_WORKSPACE\osx-arm64\publish"
+        Move-Item -Path ".\src\publish" -Destination "$env:GITHUB_WORKSPACE\osx-arm64\publish"
         Rename-Item -Path "$env:GITHUB_WORKSPACE\osx-arm64\publish\keyvaultexplorerdesktop" -NewName "Key Vault Explorer for Azure" -Force 
 
       shell: pwsh
@@ -118,9 +118,9 @@ jobs:
             linux-nuget
     - name: Publish Linux
       run: | 
-        ./build.ps1 -Runtime linux-x64 -PublishAot:$false -BuildNumber '1.0.${{github.run_number }}'
+        ./src/build.ps1 -Runtime linux-x64 -PublishAot:$false -BuildNumber '1.0.${{github.run_number }}'
         New-Item -ItemType Directory -Path "linux-x64" 
-        Move-Item -Path ".\publish" -Destination "$env:GITHUB_WORKSPACE\linux-x64\publish"
+        Move-Item -Path ".\src\publish" -Destination "$env:GITHUB_WORKSPACE\linux-x64\publish"
         gci -path  "$env:GITHUB_WORKSPACE\linux-x64\publish"
       shell: pwsh
     - name: Create Package
diff --git a/LICENSE b/LICENSE
index 3dd67a4e..4023dd36 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Arthur Thomas
+Copyright (c) Arthur Thomas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/kv.slnx b/kv.slnx
deleted file mode 100644
index 01bf12f2..00000000
--- a/kv.slnx
+++ /dev/null
@@ -1,19 +0,0 @@
-<Solution>
-  <Configurations>
-    <Platform Name="Any CPU" />
-    <Platform Name="ARM" />
-    <Platform Name="ARM64" />
-    <Platform Name="x64" />
-    <Platform Name="x86" />
-  </Configurations>
-  <Folder Name="/Solution Items/">
-    <File Path="build.ps1" />
-  </Folder>
-  <Project Path="Desktop\Desktop.csproj" />
-  <Project Path="KeyVaultExplorer.Wap\KeyVaultExplorer.Wap.wapproj" Type="{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}">
-    <Configuration Solution="*|*" Project="*|*|Deploy" />
-  </Project>
-  <Project Path="KeyVaultExplorer\KeyVaultExplorer.csproj" />
-  <Project Path="MacDesktop\MacDesktop.csproj" />
-</Solution>er.csproj" />
-</Solution>
\ No newline at end of file
diff --git a/Desktop/AppIcon.ico b/src/Desktop/AppIcon.ico
similarity index 100%
rename from Desktop/AppIcon.ico
rename to src/Desktop/AppIcon.ico
diff --git a/Desktop/AppIcon.png b/src/Desktop/AppIcon.png
similarity index 100%
rename from Desktop/AppIcon.png
rename to src/Desktop/AppIcon.png
diff --git a/Desktop/Desktop.csproj b/src/Desktop/Desktop.csproj
similarity index 100%
rename from Desktop/Desktop.csproj
rename to src/Desktop/Desktop.csproj
diff --git a/Desktop/Program.cs b/src/Desktop/Program.cs
similarity index 100%
rename from Desktop/Program.cs
rename to src/Desktop/Program.cs
diff --git a/Desktop/Properties/launchSettings.json b/src/Desktop/Properties/launchSettings.json
similarity index 100%
rename from Desktop/Properties/launchSettings.json
rename to src/Desktop/Properties/launchSettings.json
diff --git a/Desktop/app.manifest b/src/Desktop/app.manifest
similarity index 100%
rename from Desktop/app.manifest
rename to src/Desktop/app.manifest
diff --git a/Desktop/kv-orange.ico b/src/Desktop/kv-orange.ico
similarity index 100%
rename from Desktop/kv-orange.ico
rename to src/Desktop/kv-orange.ico
diff --git a/KeyVaultExplorer/App.axaml b/src/KeyVaultExplorer/App.axaml
similarity index 100%
rename from KeyVaultExplorer/App.axaml
rename to src/KeyVaultExplorer/App.axaml
diff --git a/KeyVaultExplorer/App.axaml.cs b/src/KeyVaultExplorer/App.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/App.axaml.cs
rename to src/KeyVaultExplorer/App.axaml.cs
diff --git a/KeyVaultExplorer/AppIcon.ico b/src/KeyVaultExplorer/AppIcon.ico
similarity index 100%
rename from KeyVaultExplorer/AppIcon.ico
rename to src/KeyVaultExplorer/AppIcon.ico
diff --git a/KeyVaultExplorer/Assets/Add.png b/src/KeyVaultExplorer/Assets/Add.png
similarity index 100%
rename from KeyVaultExplorer/Assets/Add.png
rename to src/KeyVaultExplorer/Assets/Add.png
diff --git a/KeyVaultExplorer/Assets/AppIcon.icns b/src/KeyVaultExplorer/Assets/AppIcon.icns
similarity index 100%
rename from KeyVaultExplorer/Assets/AppIcon.icns
rename to src/KeyVaultExplorer/Assets/AppIcon.icns
diff --git a/KeyVaultExplorer/Assets/AppIcon.ico b/src/KeyVaultExplorer/Assets/AppIcon.ico
similarity index 100%
rename from KeyVaultExplorer/Assets/AppIcon.ico
rename to src/KeyVaultExplorer/Assets/AppIcon.ico
diff --git a/KeyVaultExplorer/Assets/AppIcon.png b/src/KeyVaultExplorer/Assets/AppIcon.png
similarity index 100%
rename from KeyVaultExplorer/Assets/AppIcon.png
rename to src/KeyVaultExplorer/Assets/AppIcon.png
diff --git a/KeyVaultExplorer/Assets/Certificate.png b/src/KeyVaultExplorer/Assets/Certificate.png
similarity index 100%
rename from KeyVaultExplorer/Assets/Certificate.png
rename to src/KeyVaultExplorer/Assets/Certificate.png
diff --git a/KeyVaultExplorer/Assets/Certificate.svg b/src/KeyVaultExplorer/Assets/Certificate.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/Certificate.svg
rename to src/KeyVaultExplorer/Assets/Certificate.svg
diff --git a/KeyVaultExplorer/Assets/Close.png b/src/KeyVaultExplorer/Assets/Close.png
similarity index 100%
rename from KeyVaultExplorer/Assets/Close.png
rename to src/KeyVaultExplorer/Assets/Close.png
diff --git a/KeyVaultExplorer/Assets/Close.svg b/src/KeyVaultExplorer/Assets/Close.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/Close.svg
rename to src/KeyVaultExplorer/Assets/Close.svg
diff --git a/KeyVaultExplorer/Assets/Cloud.png b/src/KeyVaultExplorer/Assets/Cloud.png
similarity index 100%
rename from KeyVaultExplorer/Assets/Cloud.png
rename to src/KeyVaultExplorer/Assets/Cloud.png
diff --git a/KeyVaultExplorer/Assets/Cloud.svg b/src/KeyVaultExplorer/Assets/Cloud.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/Cloud.svg
rename to src/KeyVaultExplorer/Assets/Cloud.svg
diff --git a/KeyVaultExplorer/Assets/CollapseAll.png b/src/KeyVaultExplorer/Assets/CollapseAll.png
similarity index 100%
rename from KeyVaultExplorer/Assets/CollapseAll.png
rename to src/KeyVaultExplorer/Assets/CollapseAll.png
diff --git a/KeyVaultExplorer/Assets/CollapseAll.svg b/src/KeyVaultExplorer/Assets/CollapseAll.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/CollapseAll.svg
rename to src/KeyVaultExplorer/Assets/CollapseAll.svg
diff --git a/KeyVaultExplorer/Assets/FolderClosed.png b/src/KeyVaultExplorer/Assets/FolderClosed.png
similarity index 100%
rename from KeyVaultExplorer/Assets/FolderClosed.png
rename to src/KeyVaultExplorer/Assets/FolderClosed.png
diff --git a/KeyVaultExplorer/Assets/FolderClosed.svg b/src/KeyVaultExplorer/Assets/FolderClosed.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/FolderClosed.svg
rename to src/KeyVaultExplorer/Assets/FolderClosed.svg
diff --git a/KeyVaultExplorer/Assets/ForeignKey.png b/src/KeyVaultExplorer/Assets/ForeignKey.png
similarity index 100%
rename from KeyVaultExplorer/Assets/ForeignKey.png
rename to src/KeyVaultExplorer/Assets/ForeignKey.png
diff --git a/KeyVaultExplorer/Assets/ForeignKey.svg b/src/KeyVaultExplorer/Assets/ForeignKey.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/ForeignKey.svg
rename to src/KeyVaultExplorer/Assets/ForeignKey.svg
diff --git a/KeyVaultExplorer/Assets/Info.plist b/src/KeyVaultExplorer/Assets/Info.plist
similarity index 100%
rename from KeyVaultExplorer/Assets/Info.plist
rename to src/KeyVaultExplorer/Assets/Info.plist
diff --git a/KeyVaultExplorer/Assets/Key.png b/src/KeyVaultExplorer/Assets/Key.png
similarity index 100%
rename from KeyVaultExplorer/Assets/Key.png
rename to src/KeyVaultExplorer/Assets/Key.png
diff --git a/KeyVaultExplorer/Assets/Key.svg b/src/KeyVaultExplorer/Assets/Key.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/Key.svg
rename to src/KeyVaultExplorer/Assets/Key.svg
diff --git a/KeyVaultExplorer/Assets/KeyVault.png b/src/KeyVaultExplorer/Assets/KeyVault.png
similarity index 100%
rename from KeyVaultExplorer/Assets/KeyVault.png
rename to src/KeyVaultExplorer/Assets/KeyVault.png
diff --git a/KeyVaultExplorer/Assets/KeyVault.svg b/src/KeyVaultExplorer/Assets/KeyVault.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/KeyVault.svg
rename to src/KeyVaultExplorer/Assets/KeyVault.svg
diff --git a/KeyVaultExplorer/Assets/Lock.png b/src/KeyVaultExplorer/Assets/Lock.png
similarity index 100%
rename from KeyVaultExplorer/Assets/Lock.png
rename to src/KeyVaultExplorer/Assets/Lock.png
diff --git a/KeyVaultExplorer/Assets/Lock.svg b/src/KeyVaultExplorer/Assets/Lock.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/Lock.svg
rename to src/KeyVaultExplorer/Assets/Lock.svg
diff --git a/KeyVaultExplorer/Assets/NewKey.png b/src/KeyVaultExplorer/Assets/NewKey.png
similarity index 100%
rename from KeyVaultExplorer/Assets/NewKey.png
rename to src/KeyVaultExplorer/Assets/NewKey.png
diff --git a/KeyVaultExplorer/Assets/Pin.png b/src/KeyVaultExplorer/Assets/Pin.png
similarity index 100%
rename from KeyVaultExplorer/Assets/Pin.png
rename to src/KeyVaultExplorer/Assets/Pin.png
diff --git a/KeyVaultExplorer/Assets/Pin.svg b/src/KeyVaultExplorer/Assets/Pin.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/Pin.svg
rename to src/KeyVaultExplorer/Assets/Pin.svg
diff --git a/KeyVaultExplorer/Assets/Refresh.png b/src/KeyVaultExplorer/Assets/Refresh.png
similarity index 100%
rename from KeyVaultExplorer/Assets/Refresh.png
rename to src/KeyVaultExplorer/Assets/Refresh.png
diff --git a/KeyVaultExplorer/Assets/Refresh.svg b/src/KeyVaultExplorer/Assets/Refresh.svg
similarity index 100%
rename from KeyVaultExplorer/Assets/Refresh.svg
rename to src/KeyVaultExplorer/Assets/Refresh.svg
diff --git a/KeyVaultExplorer/Assets/StatusErrorOutline.png b/src/KeyVaultExplorer/Assets/StatusErrorOutline.png
similarity index 100%
rename from KeyVaultExplorer/Assets/StatusErrorOutline.png
rename to src/KeyVaultExplorer/Assets/StatusErrorOutline.png
diff --git a/KeyVaultExplorer/Assets/kv-border.ico b/src/KeyVaultExplorer/Assets/kv-border.ico
similarity index 100%
rename from KeyVaultExplorer/Assets/kv-border.ico
rename to src/KeyVaultExplorer/Assets/kv-border.ico
diff --git a/KeyVaultExplorer/Assets/kv-gray.png b/src/KeyVaultExplorer/Assets/kv-gray.png
similarity index 100%
rename from KeyVaultExplorer/Assets/kv-gray.png
rename to src/KeyVaultExplorer/Assets/kv-gray.png
diff --git a/KeyVaultExplorer/Assets/kv-orange.ico b/src/KeyVaultExplorer/Assets/kv-orange.ico
similarity index 100%
rename from KeyVaultExplorer/Assets/kv-orange.ico
rename to src/KeyVaultExplorer/Assets/kv-orange.ico
diff --git a/KeyVaultExplorer/Assets/kv.ico b/src/KeyVaultExplorer/Assets/kv.ico
similarity index 100%
rename from KeyVaultExplorer/Assets/kv.ico
rename to src/KeyVaultExplorer/Assets/kv.ico
diff --git a/KeyVaultExplorer/Assets/kv.png b/src/KeyVaultExplorer/Assets/kv.png
similarity index 100%
rename from KeyVaultExplorer/Assets/kv.png
rename to src/KeyVaultExplorer/Assets/kv.png
diff --git a/KeyVaultExplorer/Database/KvExplorerDb.cs b/src/KeyVaultExplorer/Database/KvExplorerDb.cs
similarity index 100%
rename from KeyVaultExplorer/Database/KvExplorerDb.cs
rename to src/KeyVaultExplorer/Database/KvExplorerDb.cs
diff --git a/KeyVaultExplorer/Database/QuickAccess.cs b/src/KeyVaultExplorer/Database/QuickAccess.cs
similarity index 100%
rename from KeyVaultExplorer/Database/QuickAccess.cs
rename to src/KeyVaultExplorer/Database/QuickAccess.cs
diff --git a/KeyVaultExplorer/Database/Settings.cs b/src/KeyVaultExplorer/Database/Settings.cs
similarity index 100%
rename from KeyVaultExplorer/Database/Settings.cs
rename to src/KeyVaultExplorer/Database/Settings.cs
diff --git a/KeyVaultExplorer/Database/Subscriptions.cs b/src/KeyVaultExplorer/Database/Subscriptions.cs
similarity index 100%
rename from KeyVaultExplorer/Database/Subscriptions.cs
rename to src/KeyVaultExplorer/Database/Subscriptions.cs
diff --git a/KeyVaultExplorer/Defaults.cs b/src/KeyVaultExplorer/Defaults.cs
similarity index 100%
rename from KeyVaultExplorer/Defaults.cs
rename to src/KeyVaultExplorer/Defaults.cs
diff --git a/KeyVaultExplorer/Exceptions/KvExceptions.cs b/src/KeyVaultExplorer/Exceptions/KvExceptions.cs
similarity index 100%
rename from KeyVaultExplorer/Exceptions/KvExceptions.cs
rename to src/KeyVaultExplorer/Exceptions/KvExceptions.cs
diff --git a/KeyVaultExplorer/KeyVaultExplorer.csproj b/src/KeyVaultExplorer/KeyVaultExplorer.csproj
similarity index 100%
rename from KeyVaultExplorer/KeyVaultExplorer.csproj
rename to src/KeyVaultExplorer/KeyVaultExplorer.csproj
diff --git a/KeyVaultExplorer/Models/AppSettings.cs b/src/KeyVaultExplorer/Models/AppSettings.cs
similarity index 100%
rename from KeyVaultExplorer/Models/AppSettings.cs
rename to src/KeyVaultExplorer/Models/AppSettings.cs
diff --git a/KeyVaultExplorer/Models/AuthenticatedUserClaims.cs b/src/KeyVaultExplorer/Models/AuthenticatedUserClaims.cs
similarity index 100%
rename from KeyVaultExplorer/Models/AuthenticatedUserClaims.cs
rename to src/KeyVaultExplorer/Models/AuthenticatedUserClaims.cs
diff --git a/KeyVaultExplorer/Models/Constants.cs b/src/KeyVaultExplorer/Models/Constants.cs
similarity index 100%
rename from KeyVaultExplorer/Models/Constants.cs
rename to src/KeyVaultExplorer/Models/Constants.cs
diff --git a/KeyVaultExplorer/Models/KeyVaultModel.cs b/src/KeyVaultExplorer/Models/KeyVaultModel.cs
similarity index 100%
rename from KeyVaultExplorer/Models/KeyVaultModel.cs
rename to src/KeyVaultExplorer/Models/KeyVaultModel.cs
diff --git a/KeyVaultExplorer/Models/KeyVaultResourcePlaceholder.cs b/src/KeyVaultExplorer/Models/KeyVaultResourcePlaceholder.cs
similarity index 100%
rename from KeyVaultExplorer/Models/KeyVaultResourcePlaceholder.cs
rename to src/KeyVaultExplorer/Models/KeyVaultResourcePlaceholder.cs
diff --git a/KeyVaultExplorer/Models/KeyVaultValuesAmalgamation.cs b/src/KeyVaultExplorer/Models/KeyVaultValuesAmalgamation.cs
similarity index 100%
rename from KeyVaultExplorer/Models/KeyVaultValuesAmalgamation.cs
rename to src/KeyVaultExplorer/Models/KeyVaultValuesAmalgamation.cs
diff --git a/KeyVaultExplorer/Models/SubscriptionDataItems.cs b/src/KeyVaultExplorer/Models/SubscriptionDataItems.cs
similarity index 100%
rename from KeyVaultExplorer/Models/SubscriptionDataItems.cs
rename to src/KeyVaultExplorer/Models/SubscriptionDataItems.cs
diff --git a/KeyVaultExplorer/Resources/PercentageConverter.cs b/src/KeyVaultExplorer/Resources/PercentageConverter.cs
similarity index 100%
rename from KeyVaultExplorer/Resources/PercentageConverter.cs
rename to src/KeyVaultExplorer/Resources/PercentageConverter.cs
diff --git a/KeyVaultExplorer/Resources/Resources.axaml b/src/KeyVaultExplorer/Resources/Resources.axaml
similarity index 100%
rename from KeyVaultExplorer/Resources/Resources.axaml
rename to src/KeyVaultExplorer/Resources/Resources.axaml
diff --git a/KeyVaultExplorer/Resources/Styles.axaml b/src/KeyVaultExplorer/Resources/Styles.axaml
similarity index 100%
rename from KeyVaultExplorer/Resources/Styles.axaml
rename to src/KeyVaultExplorer/Resources/Styles.axaml
diff --git a/KeyVaultExplorer/Services/AppSettingReader.cs b/src/KeyVaultExplorer/Services/AppSettingReader.cs
similarity index 100%
rename from KeyVaultExplorer/Services/AppSettingReader.cs
rename to src/KeyVaultExplorer/Services/AppSettingReader.cs
diff --git a/KeyVaultExplorer/Services/AuthService.cs b/src/KeyVaultExplorer/Services/AuthService.cs
similarity index 100%
rename from KeyVaultExplorer/Services/AuthService.cs
rename to src/KeyVaultExplorer/Services/AuthService.cs
diff --git a/KeyVaultExplorer/Services/ClipboardService.cs b/src/KeyVaultExplorer/Services/ClipboardService.cs
similarity index 100%
rename from KeyVaultExplorer/Services/ClipboardService.cs
rename to src/KeyVaultExplorer/Services/ClipboardService.cs
diff --git a/KeyVaultExplorer/Services/CustomTokenCredential.cs b/src/KeyVaultExplorer/Services/CustomTokenCredential.cs
similarity index 100%
rename from KeyVaultExplorer/Services/CustomTokenCredential.cs
rename to src/KeyVaultExplorer/Services/CustomTokenCredential.cs
diff --git a/KeyVaultExplorer/Services/DatabaseEncryptedPasswordManager.cs b/src/KeyVaultExplorer/Services/DatabaseEncryptedPasswordManager.cs
similarity index 100%
rename from KeyVaultExplorer/Services/DatabaseEncryptedPasswordManager.cs
rename to src/KeyVaultExplorer/Services/DatabaseEncryptedPasswordManager.cs
diff --git a/KeyVaultExplorer/Services/MacOSKeyChainService.cs b/src/KeyVaultExplorer/Services/MacOSKeyChainService.cs
similarity index 100%
rename from KeyVaultExplorer/Services/MacOSKeyChainService.cs
rename to src/KeyVaultExplorer/Services/MacOSKeyChainService.cs
diff --git a/KeyVaultExplorer/Services/ServiceCollectionExtension.cs b/src/KeyVaultExplorer/Services/ServiceCollectionExtension.cs
similarity index 100%
rename from KeyVaultExplorer/Services/ServiceCollectionExtension.cs
rename to src/KeyVaultExplorer/Services/ServiceCollectionExtension.cs
diff --git a/KeyVaultExplorer/Services/StorageProviderService.cs b/src/KeyVaultExplorer/Services/StorageProviderService.cs
similarity index 100%
rename from KeyVaultExplorer/Services/StorageProviderService.cs
rename to src/KeyVaultExplorer/Services/StorageProviderService.cs
diff --git a/KeyVaultExplorer/Services/StringExtensions.cs b/src/KeyVaultExplorer/Services/StringExtensions.cs
similarity index 100%
rename from KeyVaultExplorer/Services/StringExtensions.cs
rename to src/KeyVaultExplorer/Services/StringExtensions.cs
diff --git a/KeyVaultExplorer/Services/VaultService.cs b/src/KeyVaultExplorer/Services/VaultService.cs
similarity index 100%
rename from KeyVaultExplorer/Services/VaultService.cs
rename to src/KeyVaultExplorer/Services/VaultService.cs
diff --git a/KeyVaultExplorer/Validations/SecretNameValidationAttribute.cs b/src/KeyVaultExplorer/Validations/SecretNameValidationAttribute.cs
similarity index 100%
rename from KeyVaultExplorer/Validations/SecretNameValidationAttribute.cs
rename to src/KeyVaultExplorer/Validations/SecretNameValidationAttribute.cs
diff --git a/KeyVaultExplorer/ViewModels/AppViewModel.cs b/src/KeyVaultExplorer/ViewModels/AppViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/AppViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/AppViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs b/src/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/CreateNewSecretVersionViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/FilterService.cs b/src/KeyVaultExplorer/ViewModels/FilterService.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/FilterService.cs
rename to src/KeyVaultExplorer/ViewModels/FilterService.cs
diff --git a/KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs b/src/KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/KeyVaultTreeListViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/MainViewModel.cs b/src/KeyVaultExplorer/ViewModels/MainViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/MainViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/MainViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/Models/DocumentItem.cs b/src/KeyVaultExplorer/ViewModels/Models/DocumentItem.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/Models/DocumentItem.cs
rename to src/KeyVaultExplorer/ViewModels/Models/DocumentItem.cs
diff --git a/KeyVaultExplorer/ViewModels/NavigationFactory.cs b/src/KeyVaultExplorer/ViewModels/NavigationFactory.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/NavigationFactory.cs
rename to src/KeyVaultExplorer/ViewModels/NavigationFactory.cs
diff --git a/KeyVaultExplorer/ViewModels/NotificationViewModel.cs b/src/KeyVaultExplorer/ViewModels/NotificationViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/NotificationViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/NotificationViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs b/src/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/PropertiesPageViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/SettingsPageViewModel.cs b/src/KeyVaultExplorer/ViewModels/SettingsPageViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/SettingsPageViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/SettingsPageViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/SortService.cs b/src/KeyVaultExplorer/ViewModels/SortService.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/SortService.cs
rename to src/KeyVaultExplorer/ViewModels/SortService.cs
diff --git a/KeyVaultExplorer/ViewModels/SubscriptionsPageViewModel.cs b/src/KeyVaultExplorer/ViewModels/SubscriptionsPageViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/SubscriptionsPageViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/SubscriptionsPageViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/TabViewPageViewModel.cs b/src/KeyVaultExplorer/ViewModels/TabViewPageViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/TabViewPageViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/TabViewPageViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/TitleBarControlViewModel.cs b/src/KeyVaultExplorer/ViewModels/TitleBarControlViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/TitleBarControlViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/TitleBarControlViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/ToolBarViewModel.cs b/src/KeyVaultExplorer/ViewModels/ToolBarViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/ToolBarViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/ToolBarViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs b/src/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/VaultPageViewModel.cs
rename to src/KeyVaultExplorer/ViewModels/VaultPageViewModel.cs
diff --git a/KeyVaultExplorer/ViewModels/ViewModelBase.cs b/src/KeyVaultExplorer/ViewModels/ViewModelBase.cs
similarity index 100%
rename from KeyVaultExplorer/ViewModels/ViewModelBase.cs
rename to src/KeyVaultExplorer/ViewModels/ViewModelBase.cs
diff --git a/KeyVaultExplorer/Views/CustomControls/CustomTitleBar.axaml b/src/KeyVaultExplorer/Views/CustomControls/CustomTitleBar.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/CustomControls/CustomTitleBar.axaml
rename to src/KeyVaultExplorer/Views/CustomControls/CustomTitleBar.axaml
diff --git a/KeyVaultExplorer/Views/CustomControls/CustomTitleBar.axaml.cs b/src/KeyVaultExplorer/Views/CustomControls/CustomTitleBar.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/CustomControls/CustomTitleBar.axaml.cs
rename to src/KeyVaultExplorer/Views/CustomControls/CustomTitleBar.axaml.cs
diff --git a/KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml b/src/KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml
rename to src/KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml
diff --git a/KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml.cs b/src/KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml.cs
rename to src/KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml.cs
diff --git a/KeyVaultExplorer/Views/CustomControls/ToolBar.axaml b/src/KeyVaultExplorer/Views/CustomControls/ToolBar.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/CustomControls/ToolBar.axaml
rename to src/KeyVaultExplorer/Views/CustomControls/ToolBar.axaml
diff --git a/KeyVaultExplorer/Views/CustomControls/ToolBar.axaml.cs b/src/KeyVaultExplorer/Views/CustomControls/ToolBar.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/CustomControls/ToolBar.axaml.cs
rename to src/KeyVaultExplorer/Views/CustomControls/ToolBar.axaml.cs
diff --git a/KeyVaultExplorer/Views/CustomControls/UserStatusTag.axaml b/src/KeyVaultExplorer/Views/CustomControls/UserStatusTag.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/CustomControls/UserStatusTag.axaml
rename to src/KeyVaultExplorer/Views/CustomControls/UserStatusTag.axaml
diff --git a/KeyVaultExplorer/Views/CustomControls/UserStatusTag.axaml.cs b/src/KeyVaultExplorer/Views/CustomControls/UserStatusTag.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/CustomControls/UserStatusTag.axaml.cs
rename to src/KeyVaultExplorer/Views/CustomControls/UserStatusTag.axaml.cs
diff --git a/KeyVaultExplorer/Views/MainPage.axaml b/src/KeyVaultExplorer/Views/MainPage.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/MainPage.axaml
rename to src/KeyVaultExplorer/Views/MainPage.axaml
diff --git a/KeyVaultExplorer/Views/MainPage.axaml.cs b/src/KeyVaultExplorer/Views/MainPage.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/MainPage.axaml.cs
rename to src/KeyVaultExplorer/Views/MainPage.axaml.cs
diff --git a/KeyVaultExplorer/Views/MainView.axaml b/src/KeyVaultExplorer/Views/MainView.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/MainView.axaml
rename to src/KeyVaultExplorer/Views/MainView.axaml
diff --git a/KeyVaultExplorer/Views/MainView.axaml.cs b/src/KeyVaultExplorer/Views/MainView.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/MainView.axaml.cs
rename to src/KeyVaultExplorer/Views/MainView.axaml.cs
diff --git a/KeyVaultExplorer/Views/MainWindow.axaml b/src/KeyVaultExplorer/Views/MainWindow.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/MainWindow.axaml
rename to src/KeyVaultExplorer/Views/MainWindow.axaml
diff --git a/KeyVaultExplorer/Views/MainWindow.axaml.cs b/src/KeyVaultExplorer/Views/MainWindow.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/MainWindow.axaml.cs
rename to src/KeyVaultExplorer/Views/MainWindow.axaml.cs
diff --git a/KeyVaultExplorer/Views/Pages/AboutPageWindow.axaml b/src/KeyVaultExplorer/Views/Pages/AboutPageWindow.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/AboutPageWindow.axaml
rename to src/KeyVaultExplorer/Views/Pages/AboutPageWindow.axaml
diff --git a/KeyVaultExplorer/Views/Pages/AboutPageWindow.axaml.cs b/src/KeyVaultExplorer/Views/Pages/AboutPageWindow.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/AboutPageWindow.axaml.cs
rename to src/KeyVaultExplorer/Views/Pages/AboutPageWindow.axaml.cs
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml b/src/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml
rename to src/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs b/src/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs
rename to src/KeyVaultExplorer/Views/Pages/PropertiesDialogs/CreateNewSecretVersion.axaml.cs
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/OpenExternalVault.axaml b/src/KeyVaultExplorer/Views/Pages/PropertiesDialogs/OpenExternalVault.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/PropertiesDialogs/OpenExternalVault.axaml
rename to src/KeyVaultExplorer/Views/Pages/PropertiesDialogs/OpenExternalVault.axaml
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesDialogs/OpenExternalVault.axaml.cs b/src/KeyVaultExplorer/Views/Pages/PropertiesDialogs/OpenExternalVault.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/PropertiesDialogs/OpenExternalVault.axaml.cs
rename to src/KeyVaultExplorer/Views/Pages/PropertiesDialogs/OpenExternalVault.axaml.cs
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml b/src/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/PropertiesPage.axaml
rename to src/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml
diff --git a/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml.cs b/src/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/PropertiesPage.axaml.cs
rename to src/KeyVaultExplorer/Views/Pages/PropertiesPage.axaml.cs
diff --git a/KeyVaultExplorer/Views/Pages/SettingsPage.axaml b/src/KeyVaultExplorer/Views/Pages/SettingsPage.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/SettingsPage.axaml
rename to src/KeyVaultExplorer/Views/Pages/SettingsPage.axaml
diff --git a/KeyVaultExplorer/Views/Pages/SettingsPage.axaml.cs b/src/KeyVaultExplorer/Views/Pages/SettingsPage.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/SettingsPage.axaml.cs
rename to src/KeyVaultExplorer/Views/Pages/SettingsPage.axaml.cs
diff --git a/KeyVaultExplorer/Views/Pages/SubscriptionsPage.axaml b/src/KeyVaultExplorer/Views/Pages/SubscriptionsPage.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/SubscriptionsPage.axaml
rename to src/KeyVaultExplorer/Views/Pages/SubscriptionsPage.axaml
diff --git a/KeyVaultExplorer/Views/Pages/SubscriptionsPage.axaml.cs b/src/KeyVaultExplorer/Views/Pages/SubscriptionsPage.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/SubscriptionsPage.axaml.cs
rename to src/KeyVaultExplorer/Views/Pages/SubscriptionsPage.axaml.cs
diff --git a/KeyVaultExplorer/Views/Pages/TabViewPage.axaml b/src/KeyVaultExplorer/Views/Pages/TabViewPage.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/TabViewPage.axaml
rename to src/KeyVaultExplorer/Views/Pages/TabViewPage.axaml
diff --git a/KeyVaultExplorer/Views/Pages/TabViewPage.axaml.cs b/src/KeyVaultExplorer/Views/Pages/TabViewPage.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/TabViewPage.axaml.cs
rename to src/KeyVaultExplorer/Views/Pages/TabViewPage.axaml.cs
diff --git a/KeyVaultExplorer/Views/Pages/TabViewWindowingPopout.axaml b/src/KeyVaultExplorer/Views/Pages/TabViewWindowingPopout.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/TabViewWindowingPopout.axaml
rename to src/KeyVaultExplorer/Views/Pages/TabViewWindowingPopout.axaml
diff --git a/KeyVaultExplorer/Views/Pages/TabViewWindowingPopout.axaml.cs b/src/KeyVaultExplorer/Views/Pages/TabViewWindowingPopout.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/TabViewWindowingPopout.axaml.cs
rename to src/KeyVaultExplorer/Views/Pages/TabViewWindowingPopout.axaml.cs
diff --git a/KeyVaultExplorer/Views/Pages/VaultPage.axaml b/src/KeyVaultExplorer/Views/Pages/VaultPage.axaml
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/VaultPage.axaml
rename to src/KeyVaultExplorer/Views/Pages/VaultPage.axaml
diff --git a/KeyVaultExplorer/Views/Pages/VaultPage.axaml.cs b/src/KeyVaultExplorer/Views/Pages/VaultPage.axaml.cs
similarity index 100%
rename from KeyVaultExplorer/Views/Pages/VaultPage.axaml.cs
rename to src/KeyVaultExplorer/Views/Pages/VaultPage.axaml.cs
diff --git a/src/VERSION b/src/VERSION
new file mode 100644
index 00000000..1921233b
--- /dev/null
+++ b/src/VERSION
@@ -0,0 +1 @@
+1.0.0.0
diff --git a/build.ps1 b/src/build.ps1
similarity index 88%
rename from build.ps1
rename to src/build.ps1
index 10b66e50..9ab22029 100644
--- a/build.ps1
+++ b/src/build.ps1
@@ -15,9 +15,9 @@ $DebugPreference = 'continue';
 Set-Content -Path "VERSION" -Value $BuildNumber -Force
 
 $command = @"
-dotnet publish  ./Desktop/Desktop.csproj `
+dotnet publish  ./src/Desktop/Desktop.csproj `
     -r $Runtime `
-    -o .\publish `
+    -o .\src\publish `
     -c Release  `
     -f $Platform `
     -p:PublishAot=$PublishAot `
@@ -32,9 +32,9 @@ dotnet publish  ./Desktop/Desktop.csproj `
 Write-Host $command -ForegroundColor Green
 
 
-dotnet publish  ./Desktop/Desktop.csproj `
+dotnet publish  ./src/Desktop/Desktop.csproj `
     -r $Runtime `
-    -o .\publish `
+    -o .\src\publish `
     -c Release  `
     -f $Platform `
     -p:PublishAot=$PublishAot `
@@ -60,12 +60,12 @@ if ($Runtime -eq "osx-x64") {
     New-Item -ItemType Directory -Path $macOSDir -Force | Out-Null
     New-Item -ItemType Directory -Path $resourcesPath -Force | Out-Null
 
-    $filesToMove = Get-ChildItem  -Exclude @("*.pdb", "*.dsym", "Key Vault Explorer for Azure")  -Path .\publish
+    $filesToMove = Get-ChildItem  -Exclude @("*.pdb", "*.dsym", "Key Vault Explorer for Azure")  -Path .\src\publish
     foreach ($file in $filesToMove) {
         Copy-Item -Path $file -Destination $macOSDir -Force 
     }
-    Copy-Item -Path ".\KeyVaultExplorer\Assets\Info.plist" -Destination $contentsDir -Force
-    Copy-Item -Path ".\KeyVaultExplorer\Assets\AppIcon.icns" -Destination $resourcesPath -Force
+    Copy-Item -Path ".\src\KeyVaultExplorer\Assets\Info.plist" -Destination $contentsDir -Force
+    Copy-Item -Path ".\src\KeyVaultExplorer\Assets\AppIcon.icns" -Destination $resourcesPath -Force
 
     # $filesToModify = Get-ChildItem  -Path $macOSDir 
     # foreach ($file in $filesToModify) {
diff --git a/kv.sln b/src/kv.sln
similarity index 100%
rename from kv.sln
rename to src/kv.sln
diff --git a/mpdev/AppIcon.ico b/src/mpdev/AppIcon.ico
similarity index 100%
rename from mpdev/AppIcon.ico
rename to src/mpdev/AppIcon.ico
diff --git a/mpdev/msix.json b/src/mpdev/msix.json
similarity index 100%
rename from mpdev/msix.json
rename to src/mpdev/msix.json