diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/App.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/App.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/App.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/App.cs diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/MainActivity.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/MainActivity.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/MainActivity.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/MainActivity.cs diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Properties/AndroidManifest.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Properties/AndroidManifest.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Properties/AndroidManifest.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Properties/AndroidManifest.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Properties/AssemblyInfo.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Properties/AssemblyInfo.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Properties/AssemblyInfo.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Properties/AssemblyInfo.cs diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/AboutResources.txt b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/AboutResources.txt similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/AboutResources.txt rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/AboutResources.txt diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-anydpi-v26/appicon.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-anydpi-v26/appicon.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-anydpi-v26/appicon.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-anydpi-v26/appicon.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/quick_launch_tile.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/quick_launch_tile.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/quick_launch_tile.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-hdpi/quick_launch_tile.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-mdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/mipmap-xxxhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/colors.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/colors.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/colors.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/colors.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/ic_launcher_background.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/ic_launcher_background.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/ic_launcher_background.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/ic_launcher_background.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/strings.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/strings.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/strings.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/values/strings.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/xml/locales_config.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/xml/locales_config.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/xml/locales_config.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/xml/locales_config.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/Resources/xml/network_security_config.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/xml/network_security_config.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/Resources/xml/network_security_config.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/Resources/xml/network_security_config.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/VpnHood.Client.App.Android.Client.Google.csproj b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/VpnHood.Client.App.Android.Client.Google.csproj similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/VpnHood.Client.App.Android.Client.Google.csproj rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/VpnHood.Client.App.Android.Client.Google.csproj diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/_publish_aab.ps1 b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/_publish_aab.ps1 similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/_publish_aab.ps1 rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/_publish_aab.ps1 diff --git a/Apps/VpnHood.Client.App.Android.Client.Google/_publish_apk.ps1 b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/_publish_apk.ps1 similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Google/_publish_apk.ps1 rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/_publish_apk.ps1 diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/App.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/App.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/App.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/App.cs diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/MainActivity.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/MainActivity.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/MainActivity.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/MainActivity.cs diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Properties/AndroidManifest.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Properties/AndroidManifest.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Properties/AndroidManifest.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Properties/AndroidManifest.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Properties/AssemblyInfo.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Properties/AssemblyInfo.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Properties/AssemblyInfo.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Properties/AssemblyInfo.cs diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/AboutResources.txt b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/AboutResources.txt similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/AboutResources.txt rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/AboutResources.txt diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-anydpi-v26/appicon.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-anydpi-v26/appicon.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-anydpi-v26/appicon.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-anydpi-v26/appicon.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/quick_launch_tile.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/quick_launch_tile.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/quick_launch_tile.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-hdpi/quick_launch_tile.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-mdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/mipmap-xxxhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/colors.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/colors.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/colors.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/colors.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/ic_launcher_background.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/ic_launcher_background.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/ic_launcher_background.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/ic_launcher_background.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/strings.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/strings.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/strings.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/values/strings.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/xml/locales_config.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/xml/locales_config.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/xml/locales_config.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/xml/locales_config.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/Resources/xml/network_security_config.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/xml/network_security_config.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/Resources/xml/network_security_config.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/Resources/xml/network_security_config.xml diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/VpnHood.Client.App.Android.Client.Web.csproj b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/VpnHood.Client.App.Android.Client.Web.csproj similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/VpnHood.Client.App.Android.Client.Web.csproj rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/VpnHood.Client.App.Android.Client.Web.csproj diff --git a/Apps/VpnHood.Client.App.Android.Client.Web/_publish.ps1 b/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/_publish.ps1 similarity index 100% rename from Apps/VpnHood.Client.App.Android.Client.Web/_publish.ps1 rename to VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/_publish.ps1 diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/App.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/App.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/App.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/App.cs diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/AppConfigs.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/AppConfigs.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/AppConfigs.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/AppConfigs.cs diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/MainActivity.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/MainActivity.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/MainActivity.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/MainActivity.cs diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Properties/AndroidManifest.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Properties/AndroidManifest.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Properties/AndroidManifest.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Properties/AndroidManifest.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Properties/AssemblyInfo.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Properties/AssemblyInfo.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Properties/AssemblyInfo.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Properties/AssemblyInfo.cs diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/AboutResources.txt b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/AboutResources.txt similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/AboutResources.txt rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/AboutResources.txt diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/appicon.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/appicon.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/appicon.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/appicon.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/appicon_round.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/appicon_round.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/appicon_round.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/appicon_round.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/ic_banner.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/ic_banner.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/ic_banner.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/ic_banner.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/ic_channel.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/ic_channel.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/ic_channel.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-anydpi-v26/ic_channel.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/quick_launch_tile.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/quick_launch_tile.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/quick_launch_tile.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-hdpi/quick_launch_tile.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-mdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_banner_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_banner_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_banner_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_banner_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_banner_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_banner_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_banner_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_banner_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/ic_channel_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/mipmap-xxxhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/colors.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/colors.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/colors.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/colors.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/ic_launcher_background.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/ic_launcher_background.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/ic_launcher_background.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/ic_launcher_background.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/strings.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/strings.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/strings.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/values/strings.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/xml/locales_config.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/xml/locales_config.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/xml/locales_config.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/xml/locales_config.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/Resources/xml/network_security_config.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/xml/network_security_config.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/Resources/xml/network_security_config.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/Resources/xml/network_security_config.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/VpnHood.Client.App.Android.Connect.Web.csproj b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/VpnHood.Client.App.Android.Connect.Web.csproj similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/VpnHood.Client.App.Android.Connect.Web.csproj rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/VpnHood.Client.App.Android.Connect.Web.csproj diff --git a/Apps/VpnHood.Client.App.Android.Connect.Web/_publish.ps1 b/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/_publish.ps1 similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect.Web/_publish.ps1 rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/_publish.ps1 diff --git a/Apps/VpnHood.Client.App.Android.Connect/AnalyticsTracker.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/AnalyticsTracker.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/AnalyticsTracker.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/AnalyticsTracker.cs diff --git a/Apps/VpnHood.Client.App.Android.Connect/App.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/App.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/App.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/App.cs diff --git a/Apps/VpnHood.Client.App.Android.Connect/AppConfigs.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/AppConfigs.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/AppConfigs.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/AppConfigs.cs diff --git a/Apps/VpnHood.Client.App.Android.Connect/MainActivity.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/MainActivity.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/MainActivity.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/MainActivity.cs diff --git a/Apps/VpnHood.Client.App.Android.Connect/Properties/AndroidManifest.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Properties/AndroidManifest.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Properties/AndroidManifest.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Properties/AndroidManifest.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect/Properties/AssemblyInfo.cs b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Properties/AssemblyInfo.cs similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Properties/AssemblyInfo.cs rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Properties/AssemblyInfo.cs diff --git a/Apps/VpnHood.Client.App.Android.Connect/Properties/google-services.json b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Properties/google-services.json similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Properties/google-services.json rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Properties/google-services.json diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/AboutResources.txt b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/AboutResources.txt similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/AboutResources.txt rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/AboutResources.txt diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/appicon.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/appicon.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/appicon.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/appicon.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/appicon_round.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/appicon_round.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/appicon_round.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/appicon_round.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/ic_banner.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/ic_banner.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/ic_banner.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/ic_banner.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/ic_channel.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/ic_channel.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/ic_channel.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-anydpi-v26/ic_channel.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/quick_launch_tile.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/quick_launch_tile.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/quick_launch_tile.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-hdpi/quick_launch_tile.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-mdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/banner.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/banner.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/banner.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/banner.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_banner_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_banner_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_banner_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_banner_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_banner_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_banner_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_banner_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_banner_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/ic_channel_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_background.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_background.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_background.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_background.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_background_web.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_background_web.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_background_web.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_background_web.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_foreground.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_foreground.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_foreground.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_foreground.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_monochrome.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_monochrome.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_monochrome.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/appicon_monochrome.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/notification.png b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/notification.png similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/notification.png rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/mipmap-xxxhdpi/notification.png diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/values/colors.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/values/colors.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/values/colors.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/values/colors.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/values/ic_launcher_background.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/values/ic_launcher_background.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/values/ic_launcher_background.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/values/ic_launcher_background.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/values/strings.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/values/strings.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/values/strings.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/values/strings.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/xml/locales_config.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/xml/locales_config.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/xml/locales_config.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/xml/locales_config.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect/Resources/xml/network_security_config.xml b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/xml/network_security_config.xml similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/Resources/xml/network_security_config.xml rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/Resources/xml/network_security_config.xml diff --git a/Apps/VpnHood.Client.App.Android.Connect/VpnHood.Client.App.Android.Connect.Google.csproj b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/VpnHood.Client.App.Android.Connect.Google.csproj similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/VpnHood.Client.App.Android.Connect.Google.csproj rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/VpnHood.Client.App.Android.Connect.Google.csproj diff --git a/Apps/VpnHood.Client.App.Android.Connect/_publish_aab.ps1 b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/_publish_aab.ps1 similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/_publish_aab.ps1 rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/_publish_aab.ps1 diff --git a/Apps/VpnHood.Client.App.Android.Connect/_publish_apk.ps1 b/VpnHood.Apps/VpnHood.Client.App.Android.Connect/_publish_apk.ps1 similarity index 100% rename from Apps/VpnHood.Client.App.Android.Connect/_publish_apk.ps1 rename to VpnHood.Apps/VpnHood.Client.App.Android.Connect/_publish_apk.ps1 diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/cacheIndex.txt b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/cacheIndex.txt similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/cacheIndex.txt rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/cacheIndex.txt diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part1/output-info.ini b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part1/output-info.ini similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part1/output-info.ini rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part1/output-info.ini diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part2/output-info.ini b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part2/output-info.ini similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part2/output-info.ini rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part2/output-info.ini diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part3/output-info.ini b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part3/output-info.ini similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part3/output-info.ini rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part3/output-info.ini diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part4/output-info.ini b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part4/output-info.ini similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part4/output-info.ini rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part4/output-info.ini diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part5/output-info.ini b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part5/output-info.ini similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part5/output-info.ini rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part5/output-info.ini diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part6/output-info.ini b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part6/output-info.ini similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part6/output-info.ini rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part6/output-info.ini diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part7/output-info.ini b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part7/output-info.ini similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part7/output-info.ini rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part7/output-info.ini diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part8/output-info.ini b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part8/output-info.ini similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part8/output-info.ini rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part8/output-info.ini diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part9/output-info.ini b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part9/output-info.ini similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part9/output-info.ini rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup-cache/part9/output-info.ini diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup.aip b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup.aip similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup.aip rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/VpnHood.Client.App.Win.Setup.aip diff --git a/Apps/VpnHood.Client.App.Win.Client.Setup/license.rtf b/VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/license.rtf similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client.Setup/license.rtf rename to VpnHood.Apps/VpnHood.Client.App.Win.Client.Setup/license.rtf diff --git a/Apps/VpnHood.Client.App.Win.Client/App.cs b/VpnHood.Apps/VpnHood.Client.App.Win.Client/App.cs similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client/App.cs rename to VpnHood.Apps/VpnHood.Client.App.Win.Client/App.cs diff --git a/Apps/VpnHood.Client.App.Win.Client/Properties/AssemblyInfo.cs b/VpnHood.Apps/VpnHood.Client.App.Win.Client/Properties/AssemblyInfo.cs similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client/Properties/AssemblyInfo.cs rename to VpnHood.Apps/VpnHood.Client.App.Win.Client/Properties/AssemblyInfo.cs diff --git a/Apps/VpnHood.Client.App.Win.Client/Properties/app.manifest b/VpnHood.Apps/VpnHood.Client.App.Win.Client/Properties/app.manifest similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client/Properties/app.manifest rename to VpnHood.Apps/VpnHood.Client.App.Win.Client/Properties/app.manifest diff --git a/Apps/VpnHood.Client.App.Win.Client/Properties/launchSettings.json b/VpnHood.Apps/VpnHood.Client.App.Win.Client/Properties/launchSettings.json similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client/Properties/launchSettings.json rename to VpnHood.Apps/VpnHood.Client.App.Win.Client/Properties/launchSettings.json diff --git a/Apps/VpnHood.Client.App.Win.Client/Resources/VpnHood.ico b/VpnHood.Apps/VpnHood.Client.App.Win.Client/Resources/VpnHood.ico similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client/Resources/VpnHood.ico rename to VpnHood.Apps/VpnHood.Client.App.Win.Client/Resources/VpnHood.ico diff --git a/Apps/VpnHood.Client.App.Win.Client/VpnHood.Client.App.Win.Client.csproj b/VpnHood.Apps/VpnHood.Client.App.Win.Client/VpnHood.Client.App.Win.Client.csproj similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client/VpnHood.Client.App.Win.Client.csproj rename to VpnHood.Apps/VpnHood.Client.App.Win.Client/VpnHood.Client.App.Win.Client.csproj diff --git a/Apps/VpnHood.Client.App.Win.Client/_publish.ps1 b/VpnHood.Apps/VpnHood.Client.App.Win.Client/_publish.ps1 similarity index 100% rename from Apps/VpnHood.Client.App.Win.Client/_publish.ps1 rename to VpnHood.Apps/VpnHood.Client.App.Win.Client/_publish.ps1 diff --git a/Apps/VpnHood.Client.App.Win.Connect.Setup/.gitignore b/VpnHood.Apps/VpnHood.Client.App.Win.Connect.Setup/.gitignore similarity index 100% rename from Apps/VpnHood.Client.App.Win.Connect.Setup/.gitignore rename to VpnHood.Apps/VpnHood.Client.App.Win.Connect.Setup/.gitignore diff --git a/Apps/VpnHood.Client.App.Win.Connect.Setup/VpnHood.Client.App.Win.Connect.Setup.aip b/VpnHood.Apps/VpnHood.Client.App.Win.Connect.Setup/VpnHood.Client.App.Win.Connect.Setup.aip similarity index 100% rename from Apps/VpnHood.Client.App.Win.Connect.Setup/VpnHood.Client.App.Win.Connect.Setup.aip rename to VpnHood.Apps/VpnHood.Client.App.Win.Connect.Setup/VpnHood.Client.App.Win.Connect.Setup.aip diff --git a/Apps/VpnHood.Client.App.Win.Connect/App.cs b/VpnHood.Apps/VpnHood.Client.App.Win.Connect/App.cs similarity index 100% rename from Apps/VpnHood.Client.App.Win.Connect/App.cs rename to VpnHood.Apps/VpnHood.Client.App.Win.Connect/App.cs diff --git a/Apps/VpnHood.Client.App.Win.Connect/AppConfigs.cs b/VpnHood.Apps/VpnHood.Client.App.Win.Connect/AppConfigs.cs similarity index 100% rename from Apps/VpnHood.Client.App.Win.Connect/AppConfigs.cs rename to VpnHood.Apps/VpnHood.Client.App.Win.Connect/AppConfigs.cs diff --git a/Apps/VpnHood.Client.App.Win.Connect/Properties/AssemblyInfo.cs b/VpnHood.Apps/VpnHood.Client.App.Win.Connect/Properties/AssemblyInfo.cs similarity index 100% rename from Apps/VpnHood.Client.App.Win.Connect/Properties/AssemblyInfo.cs rename to VpnHood.Apps/VpnHood.Client.App.Win.Connect/Properties/AssemblyInfo.cs diff --git a/Apps/VpnHood.Client.App.Win.Connect/Properties/app.manifest b/VpnHood.Apps/VpnHood.Client.App.Win.Connect/Properties/app.manifest similarity index 100% rename from Apps/VpnHood.Client.App.Win.Connect/Properties/app.manifest rename to VpnHood.Apps/VpnHood.Client.App.Win.Connect/Properties/app.manifest diff --git a/Apps/VpnHood.Client.App.Win.Connect/Properties/launchSettings.json b/VpnHood.Apps/VpnHood.Client.App.Win.Connect/Properties/launchSettings.json similarity index 100% rename from Apps/VpnHood.Client.App.Win.Connect/Properties/launchSettings.json rename to VpnHood.Apps/VpnHood.Client.App.Win.Connect/Properties/launchSettings.json diff --git a/Apps/VpnHood.Client.App.Win.Connect/Resources/VpnHood.ico b/VpnHood.Apps/VpnHood.Client.App.Win.Connect/Resources/VpnHood.ico similarity index 100% rename from Apps/VpnHood.Client.App.Win.Connect/Resources/VpnHood.ico rename to VpnHood.Apps/VpnHood.Client.App.Win.Connect/Resources/VpnHood.ico diff --git a/Apps/VpnHood.Client.App.Win.Connect/VpnHood.Client.App.Win.Connect.csproj b/VpnHood.Apps/VpnHood.Client.App.Win.Connect/VpnHood.Client.App.Win.Connect.csproj similarity index 100% rename from Apps/VpnHood.Client.App.Win.Connect/VpnHood.Client.App.Win.Connect.csproj rename to VpnHood.Apps/VpnHood.Client.App.Win.Connect/VpnHood.Client.App.Win.Connect.csproj diff --git a/Apps/VpnHood.Client.App.Win.Connect/_publish.ps1 b/VpnHood.Apps/VpnHood.Client.App.Win.Connect/_publish.ps1 similarity index 100% rename from Apps/VpnHood.Client.App.Win.Connect/_publish.ps1 rename to VpnHood.Apps/VpnHood.Client.App.Win.Connect/_publish.ps1 diff --git a/Apps/VpnHood.Server.App.Net/AppSettings.cs b/VpnHood.Apps/VpnHood.Server.App.Net/AppSettings.cs similarity index 100% rename from Apps/VpnHood.Server.App.Net/AppSettings.cs rename to VpnHood.Apps/VpnHood.Server.App.Net/AppSettings.cs diff --git a/Apps/VpnHood.Server.App.Net/Dockerfile b/VpnHood.Apps/VpnHood.Server.App.Net/Dockerfile similarity index 100% rename from Apps/VpnHood.Server.App.Net/Dockerfile rename to VpnHood.Apps/VpnHood.Server.App.Net/Dockerfile diff --git a/Apps/VpnHood.Server.App.Net/FileAccessManagerCommand.cs b/VpnHood.Apps/VpnHood.Server.App.Net/FileAccessManagerCommand.cs similarity index 100% rename from Apps/VpnHood.Server.App.Net/FileAccessManagerCommand.cs rename to VpnHood.Apps/VpnHood.Server.App.Net/FileAccessManagerCommand.cs diff --git a/Apps/VpnHood.Server.App.Net/NLog.config b/VpnHood.Apps/VpnHood.Server.App.Net/NLog.config similarity index 100% rename from Apps/VpnHood.Server.App.Net/NLog.config rename to VpnHood.Apps/VpnHood.Server.App.Net/NLog.config diff --git a/Apps/VpnHood.Server.App.Net/NLog.xsd b/VpnHood.Apps/VpnHood.Server.App.Net/NLog.xsd similarity index 100% rename from Apps/VpnHood.Server.App.Net/NLog.xsd rename to VpnHood.Apps/VpnHood.Server.App.Net/NLog.xsd diff --git a/Apps/VpnHood.Server.App.Net/Program.cs b/VpnHood.Apps/VpnHood.Server.App.Net/Program.cs similarity index 100% rename from Apps/VpnHood.Server.App.Net/Program.cs rename to VpnHood.Apps/VpnHood.Server.App.Net/Program.cs diff --git a/Apps/VpnHood.Server.App.Net/Properties/launchSettings.json b/VpnHood.Apps/VpnHood.Server.App.Net/Properties/launchSettings.json similarity index 100% rename from Apps/VpnHood.Server.App.Net/Properties/launchSettings.json rename to VpnHood.Apps/VpnHood.Server.App.Net/Properties/launchSettings.json diff --git a/Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxNetConfigurationProvider.cs b/VpnHood.Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxNetConfigurationProvider.cs similarity index 100% rename from Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxNetConfigurationProvider.cs rename to VpnHood.Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxNetConfigurationProvider.cs diff --git a/Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxSwapMemoryProvider.cs b/VpnHood.Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxSwapMemoryProvider.cs similarity index 100% rename from Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxSwapMemoryProvider.cs rename to VpnHood.Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxSwapMemoryProvider.cs diff --git a/Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxSystemInfoProvider.cs b/VpnHood.Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxSystemInfoProvider.cs similarity index 100% rename from Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxSystemInfoProvider.cs rename to VpnHood.Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxSystemInfoProvider.cs diff --git a/Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxUtils.cs b/VpnHood.Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxUtils.cs similarity index 100% rename from Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxUtils.cs rename to VpnHood.Apps/VpnHood.Server.App.Net/Providers/Linux/LinuxUtils.cs diff --git a/Apps/VpnHood.Server.App.Net/Providers/Win/WinSystemInfoProvider.cs b/VpnHood.Apps/VpnHood.Server.App.Net/Providers/Win/WinSystemInfoProvider.cs similarity index 100% rename from Apps/VpnHood.Server.App.Net/Providers/Win/WinSystemInfoProvider.cs rename to VpnHood.Apps/VpnHood.Server.App.Net/Providers/Win/WinSystemInfoProvider.cs diff --git a/Apps/VpnHood.Server.App.Net/Pub/Linux-Docker/compose.yml b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/Linux-Docker/compose.yml similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/Linux-Docker/compose.yml rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/Linux-Docker/compose.yml diff --git a/Apps/VpnHood.Server.App.Net/Pub/Linux-Docker/install.sh b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/Linux-Docker/install.sh similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/Linux-Docker/install.sh rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/Linux-Docker/install.sh diff --git a/Apps/VpnHood.Server.App.Net/Pub/Linux/install.sh b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/Linux/install.sh similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/Linux/install.sh rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/Linux/install.sh diff --git a/Apps/VpnHood.Server.App.Net/Pub/Linux/updater.sh b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/Linux/updater.sh similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/Linux/updater.sh rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/Linux/updater.sh diff --git a/Apps/VpnHood.Server.App.Net/Pub/Linux/vhserver.sh b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/Linux/vhserver.sh similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/Linux/vhserver.sh rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/Linux/vhserver.sh diff --git a/Apps/VpnHood.Server.App.Net/Pub/Win/install.ps1 b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/Win/install.ps1 similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/Win/install.ps1 rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/Win/install.ps1 diff --git a/Apps/VpnHood.Server.App.Net/Pub/Win/updater.ps1 b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/Win/updater.ps1 similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/Win/updater.ps1 rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/Win/updater.ps1 diff --git a/Apps/VpnHood.Server.App.Net/Pub/Win/vhserver.ps1 b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/Win/vhserver.ps1 similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/Win/vhserver.ps1 rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/Win/vhserver.ps1 diff --git a/Apps/VpnHood.Server.App.Net/Pub/publish_docker.ps1 b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_docker.ps1 similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/publish_docker.ps1 rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_docker.ps1 diff --git a/Apps/VpnHood.Server.App.Net/Pub/publish_impl.ps1 b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_impl.ps1 similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/publish_impl.ps1 rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_impl.ps1 diff --git a/Apps/VpnHood.Server.App.Net/Pub/publish_linux_arm64.ps1 b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_linux_arm64.ps1 similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/publish_linux_arm64.ps1 rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_linux_arm64.ps1 diff --git a/Apps/VpnHood.Server.App.Net/Pub/publish_linux_x64.ps1 b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_linux_x64.ps1 similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/publish_linux_x64.ps1 rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_linux_x64.ps1 diff --git a/Apps/VpnHood.Server.App.Net/Pub/publish_win.ps1 b/VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_win.ps1 similarity index 100% rename from Apps/VpnHood.Server.App.Net/Pub/publish_win.ps1 rename to VpnHood.Apps/VpnHood.Server.App.Net/Pub/publish_win.ps1 diff --git a/Apps/VpnHood.Server.App.Net/ServerApp.cs b/VpnHood.Apps/VpnHood.Server.App.Net/ServerApp.cs similarity index 100% rename from Apps/VpnHood.Server.App.Net/ServerApp.cs rename to VpnHood.Apps/VpnHood.Server.App.Net/ServerApp.cs diff --git a/Apps/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj b/VpnHood.Apps/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj similarity index 100% rename from Apps/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj rename to VpnHood.Apps/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj diff --git a/Apps/VpnHood.Server.App.Net/appsettings.json b/VpnHood.Apps/VpnHood.Server.App.Net/appsettings.json similarity index 100% rename from Apps/VpnHood.Server.App.Net/appsettings.json rename to VpnHood.Apps/VpnHood.Server.App.Net/appsettings.json diff --git a/VpnHood.sln b/VpnHood.sln index 43bfdca5a..b80fc293e 100644 --- a/VpnHood.sln +++ b/VpnHood.sln @@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VpnHood.Tunneling", "VpnHoo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VpnHood.Server", "VpnHood.Server\VpnHood.Server.csproj", "{A3FE316B-2060-42A7-9752-AB1194FC778F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VpnHood.Server.App.Net", "Apps\VpnHood.Server.App.Net\VpnHood.Server.App.Net.csproj", "{1654B92F-F63E-4F89-82CD-145997667EDF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VpnHood.Server.App.Net", "VpnHood.Apps\VpnHood.Server.App.Net\VpnHood.Server.App.Net.csproj", "{1654B92F-F63E-4F89-82CD-145997667EDF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VpnHood.Client", "VpnHood.Client\VpnHood.Client.csproj", "{F281E640-1C58-4799-9A3A-FEFD30887580}" EndProject @@ -59,7 +59,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution VpnHood.sln.DotSettings = VpnHood.sln.DotSettings EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VpnHood.Client.App.Android.Connect.Google", "Apps\VpnHood.Client.App.Android.Connect\VpnHood.Client.App.Android.Connect.Google.csproj", "{93CA0868-8D4E-470F-ACEA-253BDAE2EDB7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VpnHood.Client.App.Android.Connect.Google", "VpnHood.Apps\VpnHood.Client.App.Android.Connect\VpnHood.Client.App.Android.Connect.Google.csproj", "{93CA0868-8D4E-470F-ACEA-253BDAE2EDB7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VpnHood.Client.App.Android.Common", "VpnHood.Client.App.Android.Common\VpnHood.Client.App.Android.Common.csproj", "{D6C362F7-9679-4482-9260-DAEA9F91D51C}" EndProject @@ -96,17 +96,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Server.Access.FileA EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Win.Common.WpfSpa", "VpnHood.Client.App.Win.Common.WpfSpa\VpnHood.Client.App.Win.Common.WpfSpa.csproj", "{52DF241C-B8FB-4EDC-A247-199A306A77D0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Win.Connect", "Apps\VpnHood.Client.App.Win.Connect\VpnHood.Client.App.Win.Connect.csproj", "{AF705FAC-B638-4F81-9621-E2ACC808FFA0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Win.Connect", "VpnHood.Apps\VpnHood.Client.App.Win.Connect\VpnHood.Client.App.Win.Connect.csproj", "{AF705FAC-B638-4F81-9621-E2ACC808FFA0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Android.Connect.Web", "Apps\VpnHood.Client.App.Android.Connect.Web\VpnHood.Client.App.Android.Connect.Web.csproj", "{EFEC5397-7102-4F9F-A590-7FBB87B750FB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Android.Connect.Web", "VpnHood.Apps\VpnHood.Client.App.Android.Connect.Web\VpnHood.Client.App.Android.Connect.Web.csproj", "{EFEC5397-7102-4F9F-A590-7FBB87B750FB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apps", "Apps", "{3DEEAA54-6191-41E5-AEE2-0B715D2D3F29}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VpnHood.Apps", "VpnHood.Apps", "{3DEEAA54-6191-41E5-AEE2-0B715D2D3F29}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Android.Client.Google", "Apps\VpnHood.Client.App.Android.Client.Google\VpnHood.Client.App.Android.Client.Google.csproj", "{351B4EC6-66D3-49E2-B7EB-36E0DCAB427C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Android.Client.Google", "VpnHood.Apps\VpnHood.Client.App.Android.Client.Google\VpnHood.Client.App.Android.Client.Google.csproj", "{351B4EC6-66D3-49E2-B7EB-36E0DCAB427C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Android.Client.Web", "Apps\VpnHood.Client.App.Android.Client.Web\VpnHood.Client.App.Android.Client.Web.csproj", "{5D0737CA-3DBC-4B73-8EF9-B4AD0E80C177}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Android.Client.Web", "VpnHood.Apps\VpnHood.Client.App.Android.Client.Web\VpnHood.Client.App.Android.Client.Web.csproj", "{5D0737CA-3DBC-4B73-8EF9-B4AD0E80C177}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Win.Client", "Apps\VpnHood.Client.App.Win.Client\VpnHood.Client.App.Win.Client.csproj", "{DEAD2653-E032-4755-95C6-40A73A1A8232}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VpnHood.Client.App.Win.Client", "VpnHood.Apps\VpnHood.Client.App.Win.Client\VpnHood.Client.App.Win.Client.csproj", "{DEAD2653-E032-4755-95C6-40A73A1A8232}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VpnHood.Core.Libs", "VpnHood.Core.Libs", "{CD65BE88-FB2C-4A0A-94EE-405F77BCF311}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -787,8 +789,16 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {031C3347-5944-48E0-BC3E-03515FC21552} = {CD65BE88-FB2C-4A0A-94EE-405F77BCF311} + {A3FE316B-2060-42A7-9752-AB1194FC778F} = {CD65BE88-FB2C-4A0A-94EE-405F77BCF311} {1654B92F-F63E-4F89-82CD-145997667EDF} = {3DEEAA54-6191-41E5-AEE2-0B715D2D3F29} + {F281E640-1C58-4799-9A3A-FEFD30887580} = {CD65BE88-FB2C-4A0A-94EE-405F77BCF311} {53914191-5B94-41CC-8CE4-37C9B2E0A877} = {B3EAE8F1-8ECF-4FC9-9941-28F65A2E7F3E} + {669C0BF5-1AA1-4C16-9ED2-E5B21271D8D8} = {CD65BE88-FB2C-4A0A-94EE-405F77BCF311} + {ABB3F907-FD5B-4372-B74F-FDB77D3B828E} = {CD65BE88-FB2C-4A0A-94EE-405F77BCF311} + {4C474EAA-EB63-424C-BCFA-AE2AE2067736} = {CD65BE88-FB2C-4A0A-94EE-405F77BCF311} + {CA6D2E1D-BCC2-4F8E-B78D-D28EBD943831} = {CD65BE88-FB2C-4A0A-94EE-405F77BCF311} + {CAF87B57-E046-466F-B8C5-32066CF8886B} = {CD65BE88-FB2C-4A0A-94EE-405F77BCF311} {CCEB6931-2B59-49D5-8916-BE184CEB0BA1} = {B3EAE8F1-8ECF-4FC9-9941-28F65A2E7F3E} {986CE90B-9F4F-4DEF-8C2C-9BFD8F6A1855} = {B3EAE8F1-8ECF-4FC9-9941-28F65A2E7F3E} {BF1D9516-444A-4B12-83C2-F41F8D8F0344} = {BD1C4F74-C48B-4302-90C3-0B7243C0DD20} @@ -807,6 +817,7 @@ Global {235F3F4A-F075-477D-9923-FE2360FB7EEA} = {B3EAE8F1-8ECF-4FC9-9941-28F65A2E7F3E} {D666EB32-78AA-4F7B-9CE0-D430C34E3118} = {DC9319F3-8348-498C-9A5B-77399106DB10} {BC0CE9CB-1490-4AC6-B2C5-100EE5025AD6} = {B06C66A0-47AA-4894-A794-8FAE74DB271F} + {4D625537-609E-4BFC-BD67-32285805A814} = {CD65BE88-FB2C-4A0A-94EE-405F77BCF311} {52DF241C-B8FB-4EDC-A247-199A306A77D0} = {BD1C4F74-C48B-4302-90C3-0B7243C0DD20} {AF705FAC-B638-4F81-9621-E2ACC808FFA0} = {3DEEAA54-6191-41E5-AEE2-0B715D2D3F29} {EFEC5397-7102-4F9F-A590-7FBB87B750FB} = {3DEEAA54-6191-41E5-AEE2-0B715D2D3F29}