From 4122caa16d925bd1754b3bea7df66360d47997e3 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Tue, 24 Feb 2015 23:17:49 -0800
Subject: [PATCH] webdav portal config refactoring

---
 .../EnterpriseServerElement.cs                |  16 +
 ...DavExplorerConfigurationSettingsSection.cs |   8 +
 .../Config/WebDavAppConfigManager.cs          |   5 +
 .../Managers/Users/IUserSettingsManager.cs    |   3 +-
 .../Interfaces/Storages/ITtlStorage.cs        |   4 +-
 .../Managers/Users/UserSettingsManager.cs     |   3 +-
 .../WebsitePanel.WebDav.Core.csproj           |  16 +-
 .../Wsp/Framework/WSP.cs                      |   3 +-
 .../App_Data/Countries.config                 | 249 ------
 .../App_Data/CountryStates.config             | 411 ----------
 .../ESModule_ControlsHierarchy.config         | 144 ----
 .../App_Data/Ecommerce_Modules.config         | 137 ----
 .../App_Data/Ecommerce_Pages.config           | 226 -----
 .../App_Data/ModulesData.config               | 143 ----
 .../App_Data/SiteSettings.config              |  43 -
 .../App_Data/SupportedLocales.config          |   4 -
 .../App_Data/SupportedThemes.config           |   4 -
 .../App_Data/WebsitePanel_Modules.config      | 664 ---------------
 .../App_Data/WebsitePanel_Pages.config        | 774 ------------------
 .../WebsitePanel.WebDavPortal/Web.config      |   4 +-
 .../WebsitePanel.WebDavPortal.csproj          |  19 -
 21 files changed, 39 insertions(+), 2841 deletions(-)
 create mode 100644 WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/EnterpriseServerElement.cs
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Countries.config
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/CountryStates.config
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/ESModule_ControlsHierarchy.config
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Ecommerce_Modules.config
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Ecommerce_Pages.config
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/ModulesData.config
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SiteSettings.config
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SupportedLocales.config
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SupportedThemes.config
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/WebsitePanel_Modules.config
 delete mode 100644 WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/WebsitePanel_Pages.config

diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/EnterpriseServerElement.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/EnterpriseServerElement.cs
new file mode 100644
index 00000000..e58704b6
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/EnterpriseServerElement.cs
@@ -0,0 +1,16 @@
+using System.Configuration;
+
+namespace WebsitePanel.WebDav.Core.Config.WebConfigSections
+{
+    public class EnterpriseServerElement : ConfigurationElement
+    {
+        private const string ValueKey = "url";
+
+        [ConfigurationProperty(ValueKey, IsKey = true, IsRequired = true)]
+        public string Value
+        {
+            get { return (string)this[ValueKey]; }
+            set { this[ValueKey] = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs
index 029e3565..46c9aa48 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs
@@ -9,6 +9,7 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections
         private const string WebdavRootKey = "webdavRoot";
         private const string AuthTimeoutCookieNameKey = "authTimeoutCookieName";
         private const string AppName = "applicationName";
+        private const string EnterpriseServerUrlNameKey = "enterpriseServer";
         private const string WebsitePanelConstantUserKey = "websitePanelConstantUser";
         private const string ElementsRenderingKey = "elementsRendering";
         private const string Rfc2898CryptographyKey = "rfc2898Cryptography";
@@ -28,6 +29,13 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections
             set { this[AuthTimeoutCookieNameKey] = value; }
         }
 
+        [ConfigurationProperty(EnterpriseServerUrlNameKey, IsRequired = true)]
+        public EnterpriseServerElement EnterpriseServerUrl
+        {
+            get { return (EnterpriseServerElement)this[EnterpriseServerUrlNameKey]; }
+            set { this[EnterpriseServerUrlNameKey] = value; }
+        }
+
         [ConfigurationProperty(WebdavRootKey, IsRequired = true)]
         public WebdavRootElement WebdavRoot
         {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebDavAppConfigManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebDavAppConfigManager.cs
index 1e5852a4..6256228d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebDavAppConfigManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Config/WebDavAppConfigManager.cs
@@ -47,6 +47,11 @@ namespace WebsitePanel.WebDav.Core.Config
             get { return _configSection.AuthTimeoutCookieName.Value; }
         }
 
+        public string EnterpriseServerUrl
+        {
+            get { return _configSection.EnterpriseServerUrl.Value; }
+        }
+
         public ElementsRendering ElementsRendering { get; private set; }
         public WebsitePanelConstantUserParameters WebsitePanelConstantUserParameters { get; private set; }
         public SessionKeysCollection SessionKeys { get; private set; }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Managers/Users/IUserSettingsManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Managers/Users/IUserSettingsManager.cs
index 43d8a123..cad99315 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Managers/Users/IUserSettingsManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Managers/Users/IUserSettingsManager.cs
@@ -1,5 +1,4 @@
-using WebsitePanel.EnterpriseServer;
-using WebsitePanel.WebDav.Core.Entities.Account;
+using WebsitePanel.WebDav.Core.Entities.Account;
 using WebsitePanel.WebDav.Core.Entities.Account.Enums;
 
 namespace WebsitePanel.WebDav.Core.Interfaces.Managers.Users
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Storages/ITtlStorage.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Storages/ITtlStorage.cs
index f41dfa9f..315792de 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Storages/ITtlStorage.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Interfaces/Storages/ITtlStorage.cs
@@ -1,6 +1,4 @@
-using WebsitePanel.Ecommerce.EnterpriseServer;
-
-namespace WebsitePanel.WebDav.Core.Interfaces.Storages
+namespace WebsitePanel.WebDav.Core.Interfaces.Storages
 {
     public interface ITtlStorage : IKeyValueStorage
     {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/Users/UserSettingsManager.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/Users/UserSettingsManager.cs
index e8fdb29f..5099997d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/Users/UserSettingsManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Managers/Users/UserSettingsManager.cs
@@ -1,5 +1,4 @@
-using WebsitePanel.EnterpriseServer;
-using WebsitePanel.WebDav.Core.Entities.Account;
+using WebsitePanel.WebDav.Core.Entities.Account;
 using WebsitePanel.WebDav.Core.Entities.Account.Enums;
 using WebsitePanel.WebDav.Core.Helper;
 using WebsitePanel.WebDav.Core.Interfaces.Managers.Users;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/WebsitePanel.WebDav.Core.csproj b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/WebsitePanel.WebDav.Core.csproj
index b2b5e806..da6f7c89 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/WebsitePanel.WebDav.Core.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/WebsitePanel.WebDav.Core.csproj
@@ -44,8 +44,7 @@
     </Reference>
     <Reference Include="Microsoft.Web.Services3, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Scheduler Domains\WebsitePanel\Bin\Microsoft.Web.Services3.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\Bin\Microsoft.Web.Services3.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -89,13 +88,13 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="WebsitePanel.EnterpriseServer.Base">
-      <HintPath>..\WebsitePanel.WebPortal\Bin\WebsitePanel.EnterpriseServer.Base.dll</HintPath>
+      <HintPath>..\..\Bin\WebsitePanel.EnterpriseServer.Base.dll</HintPath>
     </Reference>
     <Reference Include="WebsitePanel.EnterpriseServer.Client">
-      <HintPath>..\WebsitePanel.WebPortal\Bin\WebsitePanel.EnterpriseServer.Client.dll</HintPath>
+      <HintPath>..\..\Bin\WebsitePanel.EnterpriseServer.Client.dll</HintPath>
     </Reference>
     <Reference Include="WebsitePanel.Providers.Base">
-      <HintPath>..\WebsitePanel.WebPortal\Bin\WebsitePanel.Providers.Base.dll</HintPath>
+      <HintPath>..\..\Bin\WebsitePanel.Providers.Base.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -113,6 +112,7 @@
     <Compile Include="Config\WebConfigSections\ApplicationNameElement.cs" />
     <Compile Include="Config\WebConfigSections\AuthTimeoutCookieNameElement.cs" />
     <Compile Include="Config\WebConfigSections\ElementsRenderingElement.cs" />
+    <Compile Include="Config\WebConfigSections\EnterpriseServerElement.cs" />
     <Compile Include="Config\WebConfigSections\FileIconsElement.cs" />
     <Compile Include="Config\WebConfigSections\FileIconsElementCollection.cs" />
     <Compile Include="Config\WebConfigSections\FilesToIgnoreElement.cs" />
@@ -196,12 +196,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\WebsitePanel.WebPortal\WebsitePanel.WebPortal.csproj">
-      <Project>{C99EFB18-FFE7-45BB-8CA8-29336F3E8C68}</Project>
-      <Name>WebsitePanel.WebPortal</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\HttpErrors.resx">
       <Generator>ResXFileCodeGenerator</Generator>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Wsp/Framework/WSP.cs b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Wsp/Framework/WSP.cs
index bb91b65d..1a62f030 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Wsp/Framework/WSP.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDav.Core/Wsp/Framework/WSP.cs
@@ -34,7 +34,6 @@ using WebsitePanel.EnterpriseServer;
 using WebsitePanel.EnterpriseServer.HostedSolution;
 using WebsitePanel.WebDav.Core.Config;
 using WebsitePanel.WebDav.Core.Security.Cryptography;
-using WebsitePanel.WebPortal;
 
 namespace WebsitePanel.WebDav.Core.Wsp.Framework
 {
@@ -268,7 +267,7 @@ namespace WebsitePanel.WebDav.Core.Wsp.Framework
         public void ConfigureEnterpriseServerProxy(WebServicesClientProtocol proxy, bool applyPolicy)
         {
             // load ES properties
-            string serverUrl = PortalConfiguration.SiteSettings["EnterpriseServer"];
+            string serverUrl = WebDavAppConfigManager.Instance.EnterpriseServerUrl;
 
             EnterpriseServerProxyConfigurator cnfg = new EnterpriseServerProxyConfigurator();
             cnfg.EnterpriseServerUrl = serverUrl;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Countries.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Countries.config
deleted file mode 100644
index efcb98ee..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Countries.config
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0"?>
-<Countries>
-	<Country name="Afghanistan" key="AF" />
-	<Country name="Aland Islands" key="AX" />	
-	<Country name="Albania" key="AL" />
-	<Country name="Algeria" key="DZ" />
-	<Country name="American Samoa" key="AS" />
-	<Country name="Andorra" key="AD" />
-	<Country name="Angola" key="AO" />
-	<Country name="Anguilla" key="AI" />
-	<Country name="Antarctica" key="AQ" />
-	<Country name="Antigua and Barbuda" key="AG" />
-	<Country name="Argentina" key="AR" />
-	<Country name="Armenia" key="AM" />
-	<Country name="Aruba" key="AW" />
-	<Country name="Australia" key="AU" />
-	<Country name="Austria" key="AT" />
-	<Country name="Azerbaijan" key="AZ" />
-	<Country name="Bahamas" key="BS" />
-	<Country name="Bahrain" key="BH" />
-	<Country name="Bangladesh" key="BD" />
-	<Country name="Barbados" key="BB" />
-	<Country name="Belarus" key="BY" />
-	<Country name="Belgium" key="BE" />
-	<Country name="Belize" key="BZ" />
-	<Country name="Benin" key="BJ" />
-	<Country name="Bermuda" key="BM" />
-	<Country name="Bhutan" key="BT" />
-	<Country name="Bolivia, Plurinational State of" key="BO" />
-	<Country name="Bosnia and Herzegovina" key="BA" />
-	<Country name="Botswana" key="BW" />
-	<Country name="Bouvet Island" key="BV" />
-	<Country name="Brazil" key="BR" />
-	<Country name="British Indian Ocean Territory" key="IO" />
-	<Country name="Brunei Darussalam" key="BN" />
-	<Country name="Bulgaria" key="BG" />
-	<Country name="Burkina Faso" key="BF" />
-	<Country name="Burundi" key="BI" />
-	<Country name="Cambodia" key="KH" />
-	<Country name="Cameroon" key="CM" />
-	<Country name="Canada" key="CA" />
-	<Country name="Cape Verde" key="CV" />
-	<Country name="Cayman Islands" key="KY" />
-	<Country name="Central African Republic" key="CF" />
-	<Country name="Chad" key="TD" />
-	<Country name="Chile" key="CL" />
-	<Country name="China" key="CN" />
-	<Country name="Christmas Island" key="CX" />
-	<Country name="Cocos (Keeling) Islands" key="CC" />
-	<Country name="Colombia" key="CO" />
-	<Country name="Comoros" key="KM" />
-	<Country name="Congo" key="CG" />
-	<Country name="Congo, the Democratic Republic of the" key="CD" />
-	<Country name="Cook Islands" key="CK" />
-	<Country name="Costa Rica" key="CR" />
-	<Country name="Cote D'Ivoire" key="CI" />
-	<Country name="Croatia" key="HR" />
-	<Country name="Cuba" key="CU" />
-	<Country name="Cyprus" key="CY" />
-	<Country name="Czech Republic" key="CZ" />
-	<Country name="Denmark" key="DK" />
-	<Country name="Djibouti" key="DJ" />
-	<Country name="Dominica" key="DM" />
-	<Country name="Dominican Republic" key="DO" />
-	<Country name="Ecuador" key="EC" />
-	<Country name="Egypt" key="EG" />
-	<Country name="El Salvador" key="SV" />
-	<Country name="Equatorial Guinea" key="GQ" />
-	<Country name="Eritrea" key="ER" />
-	<Country name="Estonia" key="EE" />
-	<Country name="Ethiopia" key="ET" />
-	<Country name="Falkland Islands (Malvinas)" key="FK" />
-	<Country name="Faroe Islands" key="FO" />
-	<Country name="Fiji" key="FJ" />
-	<Country name="Finland" key="FI" />
-	<Country name="France" key="FR" />
-	<Country name="French Guiana" key="GF" />
-	<Country name="French Polynesia" key="PF" />
-	<Country name="French Southern Territories" key="TF" />
-	<Country name="Gabon" key="GA" />
-	<Country name="Gambia" key="GM" />
-	<Country name="Georgia" key="GE" />
-	<Country name="Germany" key="DE" />
-	<Country name="Ghana" key="GH" />
-	<Country name="Gibraltar" key="GI" />
-	<Country name="Greece" key="GR" />
-	<Country name="Greenland" key="GL" />
-	<Country name="Grenada" key="GD" />
-	<Country name="Guadeloupe" key="GP" />
-	<Country name="Guam" key="GU" />
-	<Country name="Guatemala" key="GT" />
-	<Country name="Guernsey" key="GG" />	
-	<Country name="Guinea" key="GN" />
-	<Country name="Guinea-Bissau" key="GW" />
-	<Country name="Guyana" key="GY" />
-	<Country name="Haiti" key="HT" />
-	<Country name="Heard Island and Mcdonald Islands" key="HM" />
-	<Country name="Holy See (Vatican City State)" key="VA" />
-	<Country name="Honduras" key="HN" />
-	<Country name="Hong Kong" key="HK" />
-	<Country name="Hungary" key="HU" />
-	<Country name="Iceland" key="IS" />
-	<Country name="India" key="IN" />
-	<Country name="Indonesia" key="ID" />
-	<Country name="Iran, Islamic Republic of" key="IR" />
-	<Country name="Iraq" key="IQ" />
-	<Country name="Ireland" key="IE" />
-	<Country name="Isle of Man" key="IM" />	
-	<Country name="Israel" key="IL" />
-	<Country name="Italy" key="IT" />
-	<Country name="Jamaica" key="JM" />
-	<Country name="Japan" key="JP" />
-	<Country name="Jersey" key="JE" />
-	<Country name="Jordan" key="JO" />
-	<Country name="Kazakhstan" key="KZ" />
-	<Country name="Kenya" key="KE" />
-	<Country name="Kiribati" key="KI" />
-	<Country name="Korea, Democratic People's Republic of" key="KP" />
-	<Country name="Korea, Republic of" key="KR" />
-	<Country name="Kuwait" key="KW" />
-	<Country name="Kyrgyzstan" key="KG" />
-	<Country name="Lao People's Democratic Republic" key="LA" />
-	<Country name="Latvia" key="LV" />
-	<Country name="Lebanon" key="LB" />
-	<Country name="Lesotho" key="LS" />
-	<Country name="Liberia" key="LR" />
-	<Country name="Libyan Arab Jamahiriya" key="LY" />
-	<Country name="Liechtenstein" key="LI" />
-	<Country name="Lithuania" key="LT" />
-	<Country name="Luxembourg" key="LU" />
-	<Country name="Macao" key="MO" />
-	<Country name="Macedonia, the Former Yugoslav Republic of" key="MK" />
-	<Country name="Madagascar" key="MG" />
-	<Country name="Malawi" key="MW" />
-	<Country name="Malaysia" key="MY" />
-	<Country name="Maldives" key="MV" />
-	<Country name="Mali" key="ML" />
-	<Country name="Malta" key="MT" />
-	<Country name="Marshall Islands" key="MH" />
-	<Country name="Martinique" key="MQ" />
-	<Country name="Mauritania" key="MR" />
-	<Country name="Mauritius" key="MU" />
-	<Country name="Mayotte" key="YT" />
-	<Country name="Mexico" key="MX" />
-	<Country name="Micronesia, Federated States of" key="FM" />
-	<Country name="Moldova, Republic of" key="MD" />
-	<Country name="Monaco" key="MC" />
-	<Country name="Mongolia" key="MN" />
-	<Country name="Montenegro" key="ME" />
-	<Country name="Montserrat" key="MS" />
-	<Country name="Morocco" key="MA" />
-	<Country name="Mozambique" key="MZ" />
-	<Country name="Myanmar" key="MM" />
-	<Country name="Namibia" key="NA" />
-	<Country name="Nauru" key="NR" />
-	<Country name="Nepal" key="NP" />
-	<Country name="Netherlands" key="NL" />
-	<Country name="Netherlands Antilles" key="AN" />
-	<Country name="New Caledonia" key="NC" />
-	<Country name="New Zealand" key="NZ" />
-	<Country name="Nicaragua" key="NI" />
-	<Country name="Niger" key="NE" />
-	<Country name="Nigeria" key="NG" />
-	<Country name="Niue" key="NU" />
-	<Country name="Norfolk Island" key="NF" />
-	<Country name="Northern Mariana Islands" key="MP" />
-	<Country name="Norway" key="NO" />
-	<Country name="Oman" key="OM" />
-	<Country name="Pakistan" key="PK" />
-	<Country name="Palau" key="PW" />
-	<Country name="Palestinian Territory, Occupied" key="PS" />
-	<Country name="Panama" key="PA" />
-	<Country name="Papua New Guinea" key="PG" />
-	<Country name="Paraguay" key="PY" />
-	<Country name="Peru" key="PE" />
-	<Country name="Philippines" key="PH" />
-	<Country name="Pitcairn" key="PN" />
-	<Country name="Poland" key="PL" />
-	<Country name="Portugal" key="PT" />
-	<Country name="Puerto Rico" key="PR" />
-	<Country name="Qatar" key="QA" />
-	<Country name="Reunion" key="RE" />
-	<Country name="Romania" key="RO" />
-	<Country name="Russian Federation" key="RU" />
-	<Country name="Rwanda" key="RW" />
-	<Country name="Saint Barthelemy" key="BL" />
-	<Country name="Saint Helena" key="SH" />
-	<Country name="Saint Kitts and Nevis" key="KN" />
-	<Country name="Saint Lucia" key="LC" />
-	<Country name="Saint Martin" key="MF" />	
-	<Country name="Saint Pierre and Miquelon" key="PM" />
-	<Country name="Saint Vincent and the Grenadines" key="VC" />
-	<Country name="Samoa" key="WS" />
-	<Country name="San Marino" key="SM" />
-	<Country name="Sao Tome and Principe" key="ST" />
-	<Country name="Saudi Arabia" key="SA" />
-	<Country name="Senegal" key="SN" />
-	<Country name="Serbia" key="RS" />
-	<Country name="Seychelles" key="SC" />
-	<Country name="Sierra Leone" key="SL" />
-	<Country name="Singapore" key="SG" />
-	<Country name="Slovakia" key="SK" />
-	<Country name="Slovenia" key="SI" />
-	<Country name="Solomon Islands" key="SB" />
-	<Country name="Somalia" key="SO" />
-	<Country name="South Africa" key="ZA" />
-	<Country name="South Georgia and the South Sandwich Islands" key="GS" />
-	<Country name="Spain" key="ES" />
-	<Country name="Sri Lanka" key="LK" />
-	<Country name="Sudan" key="SD" />
-	<Country name="Suriname" key="SR" />
-	<Country name="Svalbard and Jan Mayen" key="SJ" />
-	<Country name="Swaziland" key="SZ" />
-	<Country name="Sweden" key="SE" />
-	<Country name="Switzerland" key="CH" />
-	<Country name="Syrian Arab Republic" key="SY" />
-	<Country name="Taiwan, Province of China" key="TW" />
-	<Country name="Tajikistan" key="TJ" />
-	<Country name="Tanzania, United Republic of" key="TZ" />
-	<Country name="Thailand" key="TH" />
-	<Country name="Timor-Leste" key="TL" />
-	<Country name="Togo" key="TG" />
-	<Country name="Tokelau" key="TK" />
-	<Country name="Tonga" key="TO" />
-	<Country name="Trinidad and Tobago" key="TT" />
-	<Country name="Tunisia" key="TN" />
-	<Country name="Turkey" key="TR" />
-	<Country name="Turkmenistan" key="TM" />
-	<Country name="Turks and Caicos Islands" key="TC" />
-	<Country name="Tuvalu" key="TV" />
-	<Country name="Uganda" key="UG" />
-	<Country name="Ukraine" key="UA" />
-	<Country name="United Arab Emirates" key="AE" />
-	<Country name="United Kingdom" key="GB" />
-	<Country name="United States" key="US" />
-	<Country name="United States Minor Outlying Islands" key="UM" />
-	<Country name="Uruguay" key="UY" />
-	<Country name="Uzbekistan" key="UZ" />
-	<Country name="Vanuatu" key="VU" />
-	<Country name="Venezuela, Bolivarian Republic of" key="VE" />
-	<Country name="Viet Nam" key="VN" />
-	<Country name="Virgin Islands, British" key="VG" />
-	<Country name="Virgin Islands, U.S." key="VI" />
-	<Country name="Wallis and Futuna" key="WF" />
-	<Country name="Western Sahara" key="EH" />
-	<Country name="Yemen" key="YE" />
-	<Country name="Zambia" key="ZM" />
-	<Country name="Zimbabwe" key="ZW" />
-</Countries>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/CountryStates.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/CountryStates.config
deleted file mode 100644
index 8202f271..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/CountryStates.config
+++ /dev/null
@@ -1,411 +0,0 @@
-<?xml version="1.0"?>
-<States>
-	<!-- Canada -->
-	<State name="Alberta" key="AB" countryCode="CA" />
-	<State name="British Columbia" key="BC" countryCode="CA" />
-	<State name="Manitoba" key="MB" countryCode="CA" />
-	<State name="New Brunswick" key="NB" countryCode="CA" />
-	<State name="Newfoundland and Labrador" key="NL" countryCode="CA" />
-	<State name="Northwest Territories" key="NT" countryCode="CA" />
-	<State name="Nova Scotia" key="NS" countryCode="CA" />
-	<State name="Nunavut" key="NV" countryCode="CA" />
-	<State name="Ontario" key="ON" countryCode="CA" />
-	<State name="Prince Edward Island" key="PE" countryCode="CA" />
-	<State name="Quebec" key="QC" countryCode="CA" />
-	<State name="Saskatchewan" key="SK" countryCode="CA" />
-	<State name="Yukon Territory" key="YT" countryCode="CA" />
-
-	<!-- US -->
-	<State name="Alabama" key="AL" countryCode="US" />
-	<State name="Alaska" key="AK" countryCode="US" />
-	<State name="Arizona" key="AZ" countryCode="US" />
-	<State name="Arkansas" key="AR" countryCode="US" />
-	<State name="California" key="CA" countryCode="US" />
-	<State name="Colorado" key="CO" countryCode="US" />
-	<State name="Connecticut" key="CT" countryCode="US" />
-	<State name="Delaware" key="DE" countryCode="US" />
-	<State name="District of Columbia" key="DC" countryCode="US" />
-	<State name="Florida" key="FL" countryCode="US" />
-	<State name="Georgia" key="GA" countryCode="US" />
-	<State name="Hawaii" key="HI" countryCode="US" />
-	<State name="Idaho" key="ID" countryCode="US" />
-	<State name="Illinois" key="IL" countryCode="US" />
-	<State name="Indiana" key="IN" countryCode="US" />
-	<State name="Iowa" key="IA" countryCode="US" />
-	<State name="Kansas" key="KS" countryCode="US" />
-	<State name="Kentucky" key="KY" countryCode="US" />
-	<State name="Louisiana" key="LA" countryCode="US" />
-	<State name="Maine" key="ME" countryCode="US" />
-	<State name="Maryland" key="MD" countryCode="US" />
-	<State name="Massachusetts" key="MA" countryCode="US" />
-	<State name="Michigan" key="MI" countryCode="US" />
-	<State name="Minnesota" key="MN" countryCode="US" />
-	<State name="Mississippi" key="MS" countryCode="US" />
-	<State name="Missouri" key="MO" countryCode="US" />
-	<State name="Montana" key="MT" countryCode="US" />
-	<State name="Nebraska" key="NE" countryCode="US" />
-	<State name="Nevada" key="NV" countryCode="US" />
-	<State name="New Hampshire" key="NH" countryCode="US" />
-	<State name="New Jersey" key="NJ" countryCode="US" />
-	<State name="New Mexico" key="NM" countryCode="US" />
-	<State name="New York" key="NY" countryCode="US" />
-	<State name="North Carolina" key="NC" countryCode="US" />
-	<State name="North Dakota" key="ND" countryCode="US" />
-	<State name="Ohio" key="OH" countryCode="US" />
-	<State name="Oklahoma" key="OK" countryCode="US" />
-	<State name="Oregon" key="OR" countryCode="US" />
-	<State name="Pennsylvania" key="PA" countryCode="US" />
-	<State name="Rhode Island" key="RI" countryCode="US" />
-	<State name="South Carolina" key="SC" countryCode="US" />
-	<State name="South Dakota" key="SD" countryCode="US" />
-	<State name="Tennessee" key="TN" countryCode="US" />
-	<State name="Texas" key="TX" countryCode="US" />
-	<State name="Utah" key="UT" countryCode="US" />
-	<State name="Vermont" key="VT" countryCode="US" />
-	<State name="Virginia" key="VA" countryCode="US" />
-	<State name="Washington" key="WA" countryCode="US" />
-	<State name="West Virginia" key="WV" countryCode="US" />
-	<State name="Wisconsin" key="WI" countryCode="US" />
-	<State name="Wyoming" key="WY" countryCode="US" />
-
-	<!-- Russian Federation -->
-	<State name="Altaiskiy Kray" key="22" countryCode="RU" />
-	<State name="Amurskaya Oblast" key="28" countryCode="RU" />
-	<State name="Arkhangelskaya Oblast" key="29" countryCode="RU" />
-	<State name="Astrakhanskaya Oblast" key="30" countryCode="RU" />
-	<State name="Belgorodskaya Oblast" key="31" countryCode="RU" />
-	<State name="Bryanskaya Oblast" key="32" countryCode="RU" />
-	<State name="Chechnya" key="20" countryCode="RU" />
-	<State name="Chelyabinskaya Oblast" key="74" countryCode="RU" />
-	<State name="Chitinskaya Oblast" key="75" countryCode="RU" />
-	<State name="Chukotka Automomous District" key="87" countryCode="RU" />
-	<State name="Chuvash Republic" key="21" countryCode="RU" />
-	<State name="Evenkia Automomous District" key="88" countryCode="RU" />
-	<State name="Irkutskaya Oblast" key="38" countryCode="RU" />
-	<State name="Ivanovskaya Oblast" key="37" countryCode="RU" />
-	<State name="Jewish Autonomous Region" key="79" countryCode="RU" />
-	<State name="Kabardino-Balkaryan Republic" key="07" countryCode="RU" />
-	<State name="Kaliningradskaya Oblast" key="39" countryCode="RU" />
-	<State name="Kaluzhskaya Oblast" key="40" countryCode="RU" />
-	<State name="Kamchatskaya Oblast" key="41" countryCode="RU" />
-	<State name="Kemerovskaya Oblast" key="42" countryCode="RU" />
-	<State name="Khabarovskiy Kray" key="27" countryCode="RU" />
-	<State name="Kirovskaya Oblast" key="43" countryCode="RU" />
-	<State name="Kostromskaya Oblast" key="44" countryCode="RU" />
-	<State name="Krasnodarskiy Kray" key="23" countryCode="RU" />
-	<State name="Krasnoyarskiy Kray" key="24" countryCode="RU" />
-	<State name="Kurganskaya Oblast" key="45" countryCode="RU" />
-	<State name="Kurskaya Oblast" key="46" countryCode="RU" />
-	<State name="Leningradskaya Oblast" key="47" countryCode="RU" />
-	<State name="Lipetskaya Oblast" key="48" countryCode="RU" />
-	<State name="Magadanskaya Oblast" key="49" countryCode="RU" />
-	<State name="Moscow" key="77" countryCode="RU" />
-	<State name="Moskovskaya Oblast" key="50" countryCode="RU" />
-	<State name="Murmanskaya Oblast" key="51" countryCode="RU" />
-	<State name="Nizhegorodskaya Oblast" key="52" countryCode="RU" />
-	<State name="Novgorodskaya Oblast" key="53" countryCode="RU" />
-	<State name="Novosibirskaya Oblast" key="54" countryCode="RU" />
-	<State name="Omskaya Oblast" key="55" countryCode="RU" />
-	<State name="Orenburgskaya Oblast" key="56" countryCode="RU" />
-	<State name="Orlovskaya Oblast" key="57" countryCode="RU" />
-	<State name="Penzenskaya Oblast" key="58" countryCode="RU" />
-	<State name="Permskaya Oblast" key="59" countryCode="RU" />
-	<State name="Primorskiy Kray" key="25" countryCode="RU" />
-	<State name="Pskovskaya Oblast" key="60" countryCode="RU" />
-	<State name="Republic of Adyghe" key="01" countryCode="RU" />
-	<State name="Republic of Altai" key="04" countryCode="RU" />
-	<State name="Republic of Bashkortostan" key="02" countryCode="RU" />
-	<State name="Republic of Buryatia" key="03" countryCode="RU" />
-	<State name="Republic of Daghestan" key="05" countryCode="RU" />
-	<State name="Republic of Ingushetia" key="06" countryCode="RU" />
-	<State name="Republic of Kalmykia" key="08" countryCode="RU" />
-	<State name="Republic of Karelia" key="10" countryCode="RU" />
-	<State name="Republic of Khakassia" key="19" countryCode="RU" />
-	<State name="Republic of Komi" key="11" countryCode="RU" />
-	<State name="Republic of Mari El" key="12" countryCode="RU" />
-	<State name="Republic of Mordovia" key="13" countryCode="RU" />
-	<State name="Republic of North Ossetia - Alania" key="15" countryCode="RU" />
-	<State name="Republic of Sakha" key="14" countryCode="RU" />
-	<State name="Republic of Tuva" key="17" countryCode="RU" />
-	<State name="Rostovskaya Oblast" key="61" countryCode="RU" />
-	<State name="Ryazanskaya Oblast" key="62" countryCode="RU" />
-	<State name="Saint Petersburg" key="78" countryCode="RU" />
-	<State name="Sakhalinskaya Oblast" key="65" countryCode="RU" />
-	<State name="Samarskaya Oblast" key="63" countryCode="RU" />
-	<State name="Saratovskaya Oblast" key="64" countryCode="RU" />
-	<State name="Smolenskaya Oblast" key="67" countryCode="RU" />
-	<State name="Stavropolskiy Kray" key="26" countryCode="RU" />
-	<State name="Sverdlovskaya Oblast" key="66" countryCode="RU" />
-	<State name="Tambovskaya Oblast" key="68" countryCode="RU" />
-	<State name="Tatarstan" key="16" countryCode="RU" />
-	<State name="Tomskaya Oblast" key="70" countryCode="RU" />
-	<State name="Tul'skaya Oblast" key="71" countryCode="RU" />
-	<State name="Tverskaya Oblast" key="69" countryCode="RU" />
-	<State name="Tyumenskaya Oblast" key="72" countryCode="RU" />
-	<State name="Udmurt Republic" key="18" countryCode="RU" />
-	<State name="Ul'yanovskaya Oblast" key="73" countryCode="RU" />
-	<State name="Vladimirskaya Oblast" key="33" countryCode="RU" />
-	<State name="Volgogradskaya Oblast" key="34" countryCode="RU" />
-	<State name="Vologodskaya Oblast" key="35" countryCode="RU" />
-	<State name="Voronezhskaya Oblast" key="36" countryCode="RU" />
-	<State name="Yaroslavskaya Oblast" key="76" countryCode="RU" />
-
-	<!-- Croatia -->
-	<State name="Zagrebačka" key="01" countryCode="HR" />
-	<State name="Krapinsko-zagorska" key="02" countryCode="HR" />
-	<State name="Sisačko-moslavačka" key="03" countryCode="HR" />
-	<State name="Karlovačka" key="04" countryCode="HR" />
-	<State name="Varaždinska" key="05" countryCode="HR" />
-	<State name="Koprivničko-križevačka" key="06" countryCode="HR" />
-	<State name="Bjelovarsko-bilogorska" key="07" countryCode="HR" />
-	<State name="Primorsko-goranska" key="08" countryCode="HR" />
-	<State name="Ličko-senjska" key="09" countryCode="HR" />
-	<State name="Virovitičko-podravska" key="10" countryCode="HR" />
-	<State name="Požeško-slavonska" key="11" countryCode="HR" />
-	<State name="Brodsko-posavska" key="12" countryCode="HR" />
-	<State name="Zadarska" key="13" countryCode="HR" />
-	<State name="Osječko-baranjska" key="14" countryCode="HR" />
-	<State name="Šibensko-kninska" key="15" countryCode="HR" />
-	<State name="Vukovarsko-srijemska" key="16" countryCode="HR" />
-	<State name="Splitsko-dalmatinska" key="17" countryCode="HR" />
-	<State name="Istarska" key="18" countryCode="HR" />
-	<State name="Dubrovačko-neretvanska" key="19" countryCode="HR" />
-	<State name="Međimurska" key="20" countryCode="HR" />
-	<State name="Grad Zagreb" key="21" countryCode="HR" />
-
-	<!-- United Kingdom -->
-	<State name="-- England --" key="116" countryCode="GB" />
-	<State name="Avon" key="01" countryCode="GB" />
-	<State name="Bedfordshire" key="02" countryCode="GB" />
-	<State name="Berkshire" key="03" countryCode="GB" />
-	<State name="Bristol" key="04" countryCode="GB" />
-	<State name="Buckinghamshire" key="05" countryCode="GB" />
-	<State name="Cambridgeshire" key="06" countryCode="GB" />
-	<State name="Cheshire" key="07" countryCode="GB" />
-	<State name="Cleveland" key="08" countryCode="GB" />
-	<State name="Cornwall" key="09" countryCode="GB" />
-	<State name="Cumbria" key="10" countryCode="GB" />
-	<State name="Derbyshire" key="11" countryCode="GB" />
-	<State name="Devon" key="12" countryCode="GB" />
-	<State name="Dorset" key="13" countryCode="GB" />
-	<State name="Durham" key="14" countryCode="GB" />
-	<State name="East Riding of Yorkshire" key="15" countryCode="GB" />
-	<State name="East Sussex" key="16" countryCode="GB" />
-	<State name="Essex" key="17" countryCode="GB" />
-	<State name="Gloucestershire" key="18" countryCode="GB" />
-	<State name="Greater Manchester" key="19" countryCode="GB" />
-	<State name="Hampshire" key="20" countryCode="GB" />
-	<State name="Herefordshire" key="21" countryCode="GB" />
-	<State name="Hertfordshire" key="22" countryCode="GB" />
-	<State name="Humberside" key="23" countryCode="GB" />
-	<State name="Isle of Wight" key="24" countryCode="GB" />
-	<State name="Isles of Scilly" key="25" countryCode="GB" />
-	<State name="Kent" key="26" countryCode="GB" />
-	<State name="Lancashire" key="27" countryCode="GB" />
-	<State name="Leicestershire" key="28" countryCode="GB" />
-	<State name="Lincolnshire" key="29" countryCode="GB" />
-	<State name="London" key="30" countryCode="GB" />
-	<State name="Merseyside" key="31" countryCode="GB" />
-	<State name="Middlesex" key="32" countryCode="GB" />
-	<State name="Norfolk" key="33" countryCode="GB" />
-	<State name="North Yorkshire" key="34" countryCode="GB" />
-	<State name="Northamptonshire" key="35" countryCode="GB" />
-	<State name="Northumberland" key="36" countryCode="GB" />
-	<State name="Nottinghamshire" key="37" countryCode="GB" />
-	<State name="Oxfordshire" key="38" countryCode="GB" />
-	<State name="Rutland" key="39" countryCode="GB" />
-	<State name="Shropshire" key="40" countryCode="GB" />
-	<State name="Somerset" key="41" countryCode="GB" />
-	<State name="South Yorkshire" key="42" countryCode="GB" />
-	<State name="Staffordshire" key="43" countryCode="GB" />
-	<State name="Suffolk" key="44" countryCode="GB" />
-	<State name="Surrey" key="45" countryCode="GB" />
-	<State name="Tyne and Wear" key="46" countryCode="GB" />
-	<State name="Warwickshire" key="47" countryCode="GB" />
-	<State name="West Midlands" key="48" countryCode="GB" />
-	<State name="West Sussex" key="49" countryCode="GB" />
-	<State name="West Yorkshire" key="50" countryCode="GB" />
-	<State name="Wiltshire" key="51" countryCode="GB" />
-	<State name="Worcestershire" key="52" countryCode="GB" />
-	<State name="-- Northern Ireland --" key="117" countryCode="GB" />
-	<State name="Antrim" key="53" countryCode="GB" />
-	<State name="Armagh" key="54" countryCode="GB" />
-	<State name="Down" key="55" countryCode="GB" />
-	<State name="Fermanagh" key="56" countryCode="GB" />
-	<State name="Londonderry" key="57" countryCode="GB" />
-	<State name="Tyrone" key="58" countryCode="GB" />
-	<State name="-- Scotland --" key="118" countryCode="GB" />
-	<State name="Aberdeen City" key="59" countryCode="GB" />
-	<State name="Aberdeenshire" key="60" countryCode="GB" />
-	<State name="Angus" key="61" countryCode="GB" />
-	<State name="Argyll and Bute" key="62" countryCode="GB" />
-	<State name="Borders" key="63" countryCode="GB" />
-	<State name="Clackmannan" key="64" countryCode="GB" />
-	<State name="Dumfries and Galloway" key="65" countryCode="GB" />
-	<State name="East Ayrshire" key="67" countryCode="GB" />
-	<State name="East Dunbartonshire" key="68" countryCode="GB" />
-	<State name="East Lothian" key="69" countryCode="GB" />
-	<State name="East Renfrewshire" key="70" countryCode="GB" />
-	<State name="Edinburgh City" key="71" countryCode="GB" />
-	<State name="Falkirk" key="72" countryCode="GB" />
-	<State name="Fife" key="73" countryCode="GB" />
-	<State name="Glasgow" key="74" countryCode="GB" />
-	<State name="Highland" key="75" countryCode="GB" />
-	<State name="Inverclyde" key="76" countryCode="GB" />
-	<State name="Midlothian" key="77" countryCode="GB" />
-	<State name="Moray" key="78" countryCode="GB" />
-	<State name="North Ayrshire" key="79" countryCode="GB" />
-	<State name="North Lanarkshire" key="80" countryCode="GB" />
-	<State name="Orkney" key="81" countryCode="GB" />
-	<State name="Perthshire and Kinross" key="82" countryCode="GB" />
-	<State name="Renfrewshire" key="83" countryCode="GB" />
-	<State name="Roxburghshire" key="84" countryCode="GB" />
-	<State name="Shetland" key="85" countryCode="GB" />
-	<State name="South Ayrshire" key="86" countryCode="GB" />
-	<State name="South Lanarkshire" key="87" countryCode="GB" />
-	<State name="Stirling" key="88" countryCode="GB" />
-	<State name="West Dunbartonshire" key="89" countryCode="GB" />
-	<State name="West Lothian" key="90" countryCode="GB" />
-	<State name="Western Isles" key="91" countryCode="GB" />
-	<State name="-- Unitary Authorities of Wales --" key="119" countryCode="GB" />
-	<State name="Blaenau Gwent" key="92" countryCode="GB" />
-	<State name="Bridgend" key="93" countryCode="GB" />
-	<State name="Caerphilly" key="94" countryCode="GB" />
-	<State name="Cardiff" key="95" countryCode="GB" />
-	<State name="Carmarthenshire" key="96" countryCode="GB" />
-	<State name="Ceredigion" key="97" countryCode="GB" />
-	<State name="Conwy" key="98" countryCode="GB" />
-	<State name="Denbighshire" key="99" countryCode="GB" />
-	<State name="Flintshire" key="100" countryCode="GB" />
-	<State name="Gwynedd" key="101" countryCode="GB" />
-	<State name="Isle of Anglesey" key="102" countryCode="GB" />
-	<State name="Merthyr Tydfil" key="103" countryCode="GB" />
-	<State name="Monmouthshire" key="104" countryCode="GB" />
-	<State name="Neath Port Talbot" key="105" countryCode="GB" />
-	<State name="Newport" key="106" countryCode="GB" />
-	<State name="Pembrokeshire" key="107" countryCode="GB" />
-	<State name="Powys" key="108" countryCode="GB" />
-	<State name="Rhondda Cynon Taff" key="109" countryCode="GB" />
-	<State name="Swansea" key="110" countryCode="GB" />
-	<State name="Torfaen" key="111" countryCode="GB" />
-	<State name="The Vale of Glamorgan" key="112" countryCode="GB" />
-	<State name="Wrexham" key="113" countryCode="GB" />
-	<State name="-- GB Offshore Dependencies --" key="120" countryCode="GB" />
-	<State name="Channel Islands" key="114" countryCode="GB" />
-	<State name="Isle of Man" Ikey="115" countryCode="GB" />
-
-	<!-- Republic of Ireland  -->
-	<State name="Fingal" key="01" countryCode="IE" />
-	<State name=" Dun Laoghaire-Rathdown" key="02" countryCode="IE" />
-	<State name="South Dublin" key="03" countryCode="IE" />
-	<State name="Wicklow" key="04" countryCode="IE" />
-	<State name="Wexford" key="05" countryCode="IE" />
-	<State name="Carlow" key="06" countryCode="IE" />
-	<State name="Kildare" key="07" countryCode="IE" />
-	<State name="Meath " key="08" countryCode="IE" />
-	<State name="Louth" key="09" countryCode="IE" />
-	<State name="Monaghan" key="10" countryCode="IE" />
-	<State name="Cavan" key="11" countryCode="IE" />
-	<State name="Longford" key="12" countryCode="IE" />
-	<State name="Westmeath" key="13" countryCode="IE" />
-	<State name="Offaly" key="14" countryCode="IE" />
-	<State name="Laois" key="15" countryCode="IE" />
-	<State name="Kilkenny " key="16" countryCode="IE" />
-	<State name="Waterford" key="17" countryCode="IE" />
-	<State name="Cork" key="18" countryCode="IE" />
-	<State name="Kerryr" key="19" countryCode="IE" />
-	<State name="Limerick" key="20" countryCode="IE" />
-	<State name="North Tipperary" key="21" countryCode="IE" />
-	<State name="South Tipperary" key="22" countryCode="IE" />
-	<State name="Clare" key="23" countryCode="IE" />
-	<State name="Galway" key="24" countryCode="IE" />
-	<State name="Mayo" key="25" countryCode="IE" />
-	<State name="Roscommon" key="26" countryCode="IE" />
-	<State name="Sligo" key="27" countryCode="IE" />
-	<State name="Leitrim" key="28" countryCode="IE" />
-	<State name="Donegal" key="29" countryCode="IE" />
-
-	<!-- Republic of Turkey -->
-	<State name="Adana" key="01" countryCode="TR" />
-	<State name="Adэyaman" key="02" countryCode="TR" />
-	<State name="Afyonkarahisar" key="03" countryCode="TR" />
-	<State name="Aрrэ" key="04" countryCode="TR" />
-	<State name="Amasya" key="05" countryCode="TR" />
-	<State name="Ankara" key="06" countryCode="TR" />
-	<State name="Antalya" key="07" countryCode="TR" />
-	<State name="Artvin" key="08" countryCode="TR" />
-	<State name="Aydэn" key="09" countryCode="TR" />
-	<State name="Balэkesir" key="10" countryCode="TR" />
-	<State name="Bilecik" key="11" countryCode="TR" />
-	<State name="Bingцl" key="12" countryCode="TR" />
-	<State name="Bitlis" key="13" countryCode="TR" />
-	<State name="Bolu" key="14" countryCode="TR" />
-	<State name="Burdur" key="15" countryCode="TR" />
-	<State name="Bursa" key="16" countryCode="TR" />
-	<State name="Зanakkale" key="17" countryCode="TR" />
-	<State name="Зankэrэ" key="18" countryCode="TR" />
-	<State name="Зorum" key="19" countryCode="TR" />
-	<State name="Denizli" key="20" countryCode="TR" />
-	<State name="Diyarbakэr" key="21" countryCode="TR" />
-	<State name="Edirne" key="22" countryCode="TR" />
-	<State name="Elazэр" key="23" countryCode="TR" />
-	<State name="Erzincan" key="24" countryCode="TR" />
-	<State name="Erzurum" key="25" countryCode="TR" />
-	<State name="Eskiюehir" key="26" countryCode="TR" />
-	<State name="Gaziantep" key="27" countryCode="TR" />
-	<State name="Giresun" key="28" countryCode="TR" />
-	<State name="Gьmьюhane" key="29" countryCode="TR" />
-	<State name="Hakkari" key="30" countryCode="TR" />
-	<State name="Hatay" key="31" countryCode="TR" />
-	<State name="Isparta" key="32" countryCode="TR" />
-	<State name="Mersin" key="33" countryCode="TR" />
-	<State name="Istanbul" key="34" countryCode="TR" />
-	<State name="Эzmir" key="35" countryCode="TR" />
-	<State name="Kars" key="36" countryCode="TR" />
-	<State name="Kastamonu" key="37" countryCode="TR" />
-	<State name="Kayseri" key="38" countryCode="TR" />
-	<State name="Kэrklareli" key="39" countryCode="TR" />
-	<State name="Kэrюehir" key="40" countryCode="TR" />
-	<State name="Kocaeli" key="41" countryCode="TR" />
-	<State name="Konya" key="42" countryCode="TR" />
-	<State name="Kьtahya" key="43" countryCode="TR" />
-	<State name="Malatya" key="44" countryCode="TR" />
-	<State name="Manisa" key="45" countryCode="TR" />
-	<State name="Kahramanmaraю" key="46" countryCode="TR" />
-	<State name="Mardin" key="47" countryCode="TR" />
-	<State name="Muрla" key="48" countryCode="TR" />
-	<State name="Muю" key="49" countryCode="TR" />
-	<State name="Nevюehir" key="50" countryCode="TR" />
-	<State name="Niрde" key="51" countryCode="TR" />
-	<State name="Ordu" key="52" countryCode="TR" />
-	<State name="Rize" key="53" countryCode="TR" />
-	<State name="Sakarya" key="54" countryCode="TR" />
-	<State name="Samsun" key="55" countryCode="TR" />
-	<State name="Siirt" key="56" countryCode="TR" />
-	<State name="Sinop" key="57" countryCode="TR" />
-	<State name="Sivas" key="58" countryCode="TR" />
-	<State name="Tekirdaр" key="59" countryCode="TR" />
-	<State name="Tokat" key="60" countryCode="TR" />
-	<State name="Trabzon" key="61" countryCode="TR" />
-	<State name="Tunceli" key="62" countryCode="TR" />
-	<State name="Юanlэurfa" key="63" countryCode="TR" />
-	<State name="Uюak" key="64" countryCode="TR" />
-	<State name="Van" key="65" countryCode="TR" />
-	<State name="Yozgat" key="66" countryCode="TR" />
-	<State name="Zonguldak" key="67" countryCode="TR" />
-	<State name="Aksaray" key="68" countryCode="TR" />
-	<State name="Bayburt" key="69" countryCode="TR" />
-	<State name="Karaman" key="70" countryCode="TR" />
-	<State name="Kэrэkkale" key="71" countryCode="TR" />
-	<State name="Batman" key="72" countryCode="TR" />
-	<State name="Юэrnak" key="73" countryCode="TR" />
-	<State name="Bartэn" key="74" countryCode="TR" />
-	<State name="Ardahan" key="75" countryCode="TR" />
-	<State name="Iрdэr" key="76" countryCode="TR" />
-	<State name="Yalova" key="77" countryCode="TR" />
-	<State name="Karabьk" key="78" countryCode="TR" />
-	<State name="Kilis" key="79" countryCode="TR" />
-	<State name="Osmaniye" key="80" countryCode="TR" />
-	<State name="Dьzce" key="81" countryCode="TR" />
-
-</States>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/ESModule_ControlsHierarchy.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/ESModule_ControlsHierarchy.config
deleted file mode 100644
index f2f41087..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/ESModule_ControlsHierarchy.config
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Controls>
-	<!--<Control key="" />-->
-  <!--<Control key="create_organization" />-->
-      
-      
-  <!--Home-->
-  <Control key="organization_home" />
-
-
-  <!--Organization-->   
-	<Control key="users" />
-  <Control key="edit_user" general_key="users" /> <!--?-->
-	<Control key="create_user" general_key="users" />
-  <Control key="user_memberof" general_key="users" />
-	<!--<Control key="organization_user_setup" />-->
-
-  <Control key="secur_groups" />
-  <Control key="create_secur_group" general_key="secur_groups" />
-  <Control key="secur_group_settings" general_key="secur_groups" />
-  <Control key="secur_group_memberof" general_key="secur_groups" />
-
-  <Control key="org_domains" />
-  <Control key="org_add_domain" general_key="org_domains" />
-      
-      
-  <!--Exchange-->
-	<Control key="mailboxes" />
-  <!--<Control key="archivingmailboxes" />-->
-  <Control key="create_mailbox" general_key="mailboxes" />
-	<Control key="mailbox_settings" general_key="mailboxes" />
-  <Control key="mailbox_mobile" general_key="mailboxes" />
-  <Control key="mailbox_mobile_details" general_key="mailboxes" />
-	<Control key="mailbox_addresses" general_key="mailboxes" />
-	<Control key="mailbox_mailflow" general_key="mailboxes" />
-	<Control key="mailbox_permissions" general_key="mailboxes" />
-	<Control key="mailbox_advanced" general_key="mailboxes" />
-	<Control key="mailbox_setup" general_key="mailboxes" />
-  <Control key="mailbox_memberof" general_key="mailboxes" />
-      
-	<Control key="contacts" />
-	<Control key="create_contact" general_key="contacts" />
-	<Control key="contact_settings" general_key="contacts" />
-	<Control key="contact_mailflow" general_key="contacts" />
-      
-	<Control key="dlists" />
-	<Control key="create_dlist" general_key="dlists" />
-	<Control key="dlist_settings" general_key="dlists" />
-	<Control key="dlist_addresses" general_key="dlists" />
-	<Control key="dlist_mailflow" general_key="dlists" />
-	<Control key="dlist_permissions" general_key="dlists" />
-  <Control key="dlist_memberof" general_key="dlists" />
-
-  <Control key="disclaimers" />
-  <Control key="disclaimers_settings" general_key="disclaimers" />
-
-  <Control key="public_folders" />
-	<Control key="create_public_folder" general_key="public_folders" />
-	<Control key="public_folder_settings" general_key="public_folders" />
-	<Control key="public_folder_addresses" general_key="public_folders" />
-	<Control key="public_folder_mailflow" general_key="public_folders" />
-	<Control key="public_folder_mailenable" general_key="public_folders" />
-      
-	<Control key="domains" />
-  <Control key="add_domain" general_key="domains" />
-  <Control key="domain_records" general_key="domains" />
-      
-	<Control key="storage_usage" />
-	<Control key="storage_usage_details" general_key="storage_usage" />
-	<!--<Control key="storage_limits" />-->
-    
-	<Control key="activesync_policy" />
-  
-  <Control key="mailboxplans" />
-  <Control key="retentionpolicy" />
-  <Control key="retentionpolicytag" />
-  <Control key="add_mailboxplan" general_key="mailboxplans" /> <!--?-->
-
-  
-  <!--CRM-->
-  <Control key="CRMOrganizationDetails" />
-  
-	<Control key="CRMUsers" />
-	<Control key="CRMUserRoles" general_key="CRMUsers" />
-	<Control key="create_crm_user" general_key="CRMUsers" />
-  
-  <Control key="crm_storage_settings" />
-
-
-  <!--SharePoint-->
-  <Control key="sharepoint_sitecollections" />
-	<Control key="sharepoint_edit_sitecollection" general_key="sharepoint_sitecollections" />
-	<Control key="sharepoint_backup_sitecollection" general_key="sharepoint_sitecollections" />
-	<Control key="sharepoint_restore_sitecollection" general_key="sharepoint_sitecollections" />
-  
-	<Control key="sharepoint_storage_settings" />
-  
-	<Control key="sharepoint_storage_usage" />
-
-
-  <!--BlackBerry-->
-	<Control key="blackberry_users" />
-	<Control key="create_new_blackberry_user" general_key="blackberry_users" />
-	<Control key="edit_blackberry_user" general_key="blackberry_users" />
-
-
-  <!--OCS-->
-  <Control key="ocs_users" />
-	<Control key="create_new_ocs_user" general_key="ocs_users" />
-	<Control key="edit_ocs_user" general_key="ocs_users" />
-
-
-  <!--Lync--> 
-  <Control key="lync_users"/>
-  <Control key="create_new_lync_user" general_key="lync_users" />
-  <Control key="edit_lync_user" general_key="lync_users" />
-  
-  <Control key="lync_userplans" />
-  <Control key="add_lyncuserplan" general_key="lync_userplans" />
-  
-  <Control key="lync_federationdomains" />
-  <Control key="add_lyncfederation_domain" general_key="lync_federationdomains" />
-
-  <Control key="lync_phonenumbers" />
-  <Control key="allocate_phonenumbers" general_key="lync_phonenumbers" />
-      
-      
-  <!--EnterpriseStorage-->
-  <Control key="enterprisestorage_folders" />
-  <Control key="create_enterprisestorage_folder" general_key="enterprisestorage_folders" />
-  <Control key="enterprisestorage_folder_settings" general_key="enterprisestorage_folders" />
-      
-  <Control key="enterprisestorage_drive_maps" />
-  <Control key="create_enterprisestorage_drive_map" general_key="enterprisestorage_drive_maps" />
-
-  <!--RDS-->
-  <Control key="rds_servers" />
-  <Control key="rds_add_server" general_key="rds_servers"/>
-  
-  <Control key="rds_collections" />
-  <Control key="rds_create_collection" general_key="rds_collections" />
-  <Control key="rds_collection_edit_apps" general_key="rds_collections" />
-  <Control key="rds_collection_edit_users" general_key="rds_collections" />
-</Controls>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Ecommerce_Modules.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Ecommerce_Modules.config
deleted file mode 100644
index 9a80329a..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Ecommerce_Modules.config
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ModuleDefinitions>
-	<ModuleDefinition id="ecEcommerceSettings">
-		<Controls>
-			<Control key="" src="Ecommerce/EcommerceSystemSettings.ascx" title="ecEcommerceSettings" type="View" />
-			<Control key="credit_card" src="Ecommerce/PaymentMethodCreditCard.ascx" title="ecCreditCardMethod" type="View" />
-			<Control key="2co" src="Ecommerce/PaymentMethod2Checkout.ascx" title="ec2CheckoutMethod" type="View" />
-			<Control key="pp_account" src="Ecommerce/PaymentMethodPayPalAccount.ascx" title="ecPPAccountMethod" type="View" />
-			<Control key="offline" src="Ecommerce/PaymentMethodOffline.ascx" title="ecOfflineMethod" type="View" />
-			<Control key="enom" src="Ecommerce/DomainRegistrarEnom.ascx" title="ecEnomRegistrar" type="View" />
-			<Control key="directi" src="Ecommerce/DomainRegistrarDirecti.ascx" title="ecDirectiRegistrar" type="View" />
-			<Control key="new_invoice" src="Ecommerce/NotificationNewInvoice.ascx" title="ecNotifyNewInvoice" type="View" />
-			<Control key="payment_rcvd" src="Ecommerce/NotificationPaymentReceived.ascx" title="ecNotifyPaymentRcvd" type="View" />
-			<Control key="svc_activated" src="Ecommerce/NotificationServiceActivated.ascx" title="ecNotifySvcActivated" type="View" />
-			<Control key="svc_suspended" src="Ecommerce/NotificationServiceSuspended.ascx" title="ecNotifySvcSuspended" type="View" />
-			<Control key="svc_cancelled" src="Ecommerce/NotificationServiceCancelled.ascx" title="ecNotifySvcCancelled" type="View" />
-			<Control key="terms_conds" src="Ecommerce/TermsAndConditionsEdit.ascx" title="ecTermsAndConds" type="View" />
-			<Control key="prov_settings" src="Ecommerce/ProvisioningSettingsEdit.ascx" title="ecProvSettings" type="View" />
-			<Control key="welcome_msg" src="Ecommerce/StorefrontWelcomeEdit.ascx" title="ecStorefronWelcomeMsg" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecCustomersServices">
-		<Controls>
-			<Control key="" src="Ecommerce/CustomersServices.ascx" title="ecCustomersServices" type="View" icon="3d_level_48.png" />
-			<Control key="view_svc" src="Ecommerce/CustomersServicesViewService.ascx" title="ecServiceDetails" type="View" icon="3d_info_48.png" />
-			<Control key="upgrade_svc" src="Ecommerce/CustomersServicesUpgradeService.ascx" title="ecServiceUpgrade" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecCustomerPaymentProfile">
-		<Controls>
-			<Control key="" src="Ecommerce/CustomerPaymentProfile.ascx" title="ecCustomerPaymentProfile" type="View" icon="3d_level_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecCustomersPayments">
-		<Controls>
-			<Control key="" src="Ecommerce/CustomersPayments.ascx" title="ecCustomersPayments" type="View" icon="reward_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecCustomersInvoices">
-		<Controls>
-			<Control key="" src="Ecommerce/CustomersInvoices.ascx" title="ecCustomersInvoices" type="View" icon="invoice_48.png"/>
-			<Control key="view_invoice" src="Ecommerce/CustomersInvoicesViewInvoice.ascx" title="ecInvoiceDetails" icon="invoice_info_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecStorefrontWelcome">
-		<Controls>
-			<Control key="" src="Ecommerce/StorefrontWelcome.ascx" title="ecStorefrontWelcome" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecQuickSignup">
-		<Controls>
-			<Control key="" src="Ecommerce/QuickSignup.ascx" title="ecQuickSignup" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecViewCategory">
-		<Controls>
-			<Control key="" src="Ecommerce/StorefrontViewCategory.ascx" title="ecViewCategory" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecProductDetails">
-		<Controls>
-			<Control key="" src="Ecommerce/ViewProductDetails.ascx" title="ecProductDetails" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecTaxations">
-		<Controls>
-			<Control key="" src="Ecommerce/Taxations.ascx" title="ecTaxations" type="View" />
-			<Control key="add_tax" src="Ecommerce/TaxationsAddTax.ascx" title="ecAddTax" type="View" />
-			<Control key="edit_tax" src="Ecommerce/TaxationsEditTax.ascx" title="ecEditTax" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecBillingCycles">
-		<Controls>
-			<Control key="" src="Ecommerce/BillingCycles.ascx" title="ecBillingCycles" type="View" />
-			<Control key="add_billingcycle" src="Ecommerce/BillingCyclesAddCycle.ascx" title="ecAddBillingCycle" type="View" />
-			<Control key="edit_billingcycle" src="Ecommerce/BillingCyclesEditCycle.ascx" title="ecEditBillingCycle" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecHostingPlans">
-		<Controls>
-			<Control key="" src="Ecommerce/HostingPlans.ascx" title="ecHostingPlans" type="View" />
-			<Control key="add_hostingplan" src="Ecommerce/HostingPlansAddPlan.ascx" title="ecAddHostingPlan" type="View" />
-			<Control key="edit_hostingplan" src="Ecommerce/HostingPlansEditPlan.ascx" title="ecEditHostingPlan" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecDomainNames">
-		<Controls>
-			<Control key="" src="Ecommerce/DomainNames.ascx" title="ecDomainNames" type="View" />
-			<Control key="add_tld" src="Ecommerce/DomainNamesAddDomain.ascx" title="ecAddDomainName" type="View" />
-			<Control key="edit_tld" src="Ecommerce/DomainNamesEditDomain.ascx" title="ecEditDomainName" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecHostingAddons">
-		<Controls>
-			<Control key="" src="Ecommerce/HostingAddons.ascx" title="ecHostingAddons" type="View" icon="webcam_48.png" />
-			<Control key="add_hostingaddon" src="Ecommerce/HostingAddonsAddAddon.ascx" title="ecAddHostingAddon" type="View" icon="webcam_add_48.png" />
-			<Control key="edit_hostingaddon" src="Ecommerce/HostingAddonsEditAddon.ascx" title="ecEditHostingAddon" type="View" icon="webcam_write_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecCategories">
-		<Controls>
-			<Control key="" src="Ecommerce/Categories.ascx" title="ecCategories" type="View" icon="inventory_48.png" />
-			<Control key="AddItem" src="Ecommerce/CategoriesAddCategory.ascx" title="ecAddCategory" type="View" icon="inventory_add_48.png" />
-			<Control key="EditItem" src="Ecommerce/CategoriesEditCategory.ascx" title="ecEditCategory" type="View" icon="inventory_write_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecOrderCheckout">
-		<Controls>
-			<Control key="" src="Ecommerce/OrderCheckout.ascx" title="ecOrderCheckout" type="View" icon="invoice_next_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecOrderComplete">
-		<Controls>
-			<Control key="" src="Ecommerce/OrderComplete.ascx" title="ecOrderComplete" type="View" icon="invoice_ok_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecOrderFailed">
-		<Controls>
-			<Control key="" src="Ecommerce/OrderFailed.ascx" title="ecOrderFailed" type="View" icon="invoice_close_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecOrderProduct">
-		<Controls>
-			<Control key="" src="Ecommerce/StorefrontOrderProduct.ascx" title="ecOrderProduct" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecStorefrontMenu">
-		<Controls>
-			<Control key="" src="Ecommerce/StorefrontMenu.ascx" title="ecStorefrontCatalogMenu" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ecTermsAndConditions">
-		<Controls>
-			<Control key="" src="Ecommerce/TermsAndConditions.ascx" title="ecTermsAndConditions" type="View" />
-		</Controls>
-	</ModuleDefinition>
-</ModuleDefinitions>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Ecommerce_Pages.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Ecommerce_Pages.config
deleted file mode 100644
index 08a8c928..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/Ecommerce_Pages.config
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Pages>
-
-	<include file="ModulesData.config" />
-	
-	<Page name="QuickSignup" roles="?" hidden="true" skin="Storefront.ascx"  adminskin="Storefront.ascx">
-		<Content id="ContentPane">
-			<Module moduleDefinitionID="ecQuickSignup" title="ecQuickSignup" container="Clear.ascx" />
-		</Content>
-	</Page>
-	
-	<Page name="ecOrderCheckout" roles="*" hidden="true" skin="Storefront.ascx"  adminskin="Storefront.ascx">
-		<Content id="ContentPane">
-			<Module moduleDefinitionID="ecOrderCheckout" title="ecOrderCheckout" />
-		</Content>
-	</Page>
-
-	<Page name="ecOrderComplete" roles="*" hidden="true" skin="Storefront.ascx" adminskin="Storefront.ascx">
-		<Content id="ContentPane">
-			<Module moduleDefinitionID="ecOrderComplete" title="ecOrderComplete" />
-		</Content>
-	</Page>
-
-	<Page name="ecOrderFailed" roles="*" hidden="true" skin="Storefront.ascx" adminskin="Storefront.ascx">
-		<Content id="ContentPane">
-			<Module moduleDefinitionID="ecOrderFailed" title="ecOrderFailed" />
-		</Content>
-	</Page>
-	
-	<Page name="ecTermsAndConditions" roles="?" hidden="true" skin="SimpleWhite.ascx">
-		<Content id="ContentPane">
-			<Module moduleDefinitionID="ecTermsAndConditions" title="ecTermsAndConditions" container="Clear.ascx" />
-		</Content>
-	</Page>
-
-	<Page name="ecProductDetails" roles="?" hidden="true" skin="SimpleWhite.ascx">
-		<Content id="ContentPane">
-			<Module moduleDefinitionID="ecProductDetails" title="ecProductDetails" container="Clear.ascx" />
-		</Content>
-	</Page>
-
-	<Page name="ecOnlineStore" roles="?" hidden="true" skin="Storefront2.ascx" adminskin="Storefront2.ascx">
-		<Content id="LeftPane">
-			<Module moduleDefinitionID="ecStorefrontMenu" title="ecStorefrontCatalogMenu" container="Clear.ascx" />
-		</Content>
-		<Content id="ContentPane">
-			<Module moduleDefinitionID="ecStorefrontWelcome" title="ecStorefrontWelcome" container="Clear.ascx" />
-		</Content>
-		<Pages>
-			<Page name="ecViewCategory" roles="?" hidden="true" skin="Storefront2.ascx" adminskin="Storefront2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="ecStorefrontMenu" title="ecStorefrontCatalogMenu" container="Clear.ascx" />
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecViewCategory" title="ecViewCategory" container="Clear.ascx" />
-				</Content>
-			</Page>
-			<Page name="ecOrderProduct" roles="?" hidden="true" skin="Storefront2.ascx" adminskin="Storefront2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="ecStorefrontMenu" title="ecStorefrontCatalogMenu" container="Clear.ascx" />
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecOrderProduct" title="ecOrderProduct" container="Clear.ascx" />
-				</Content>
-			</Page>
-		</Pages>
-	</Page>
-	
-	<Page name="ecEcommerceAdmin" hidden="true" roles="Administrator,Reseller" enabled="false">
-		<Pages>
-			<Page name="ecEcommerceSettings" roles="Administrator,Reseller" adminskin="Browse1.ascx" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecEcommerceSettings" title="ecEcommerceSettings" />
-				</Content>
-			</Page>
-			<Page name="ecBillingCycles" roles="Administrator,Reseller" adminskin="Browse2.ascx" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecBillingCycles" title="ecBillingCycles" />
-				</Content>
-			</Page>
-			<Page name="ecHostingPlans" roles="Administrator,Reseller" adminskin="Browse2.ascx" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecHostingPlans" title="ecHostingPlans" />
-				</Content>
-			</Page>
-			<Page name="ecHostingAddons" roles="Administrator,Reseller" adminskin="Browse2.ascx" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecHostingAddons" title="ecHostingAddons" />
-				</Content>
-			</Page>
-			<Page name="ecDomainNames" roles="Administrator,Reseller" adminskin="Browse2.ascx" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecDomainNames" title="ecDomainNames" />
-				</Content>
-			</Page>
-			<Page name="ecCategories" roles="Administrator,Reseller" adminskin="Browse2.ascx" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecCategories" title="ecCategories" />
-				</Content>
-			</Page>
-			<Page name="ecTaxations" roles="Administrator,Reseller" adminskin="Browse2.ascx" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecTaxations" title="ecTaxations" />
-				</Content>
-			</Page>
-			<Page name="ecCustomersPayments" roles="Administrator,Reseller" adminskin="Browse1.ascx" skin="Browse1.ascx">
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecCustomersPayments" title="ecCustomersPayments">
-						<Settings>
-							<Add name="IsReseller" value="True" />
-						</Settings>
-					</Module>
-				</Content>
-			</Page>
-			<Page name="ecCustomersInvoices" roles="Administrator,Reseller" adminskin="Browse1.ascx" skin="Browse1.ascx">
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecCustomersInvoices" title="ecCustomersInvoices">
-						<Settings>
-							<Add name="IsReseller" value="True" />
-						</Settings>
-					</Module>
-				</Content>
-			</Page>
-			<Page name="ecCustomersServices" roles="Administrator,Reseller" adminskin="Browse1.ascx" skin="Browse1.ascx">
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecCustomersServices" title="ecCustomersServices">
-						<Settings>
-							<Add name="IsReseller" value="True" />
-						</Settings>
-					</Module>
-				</Content>
-			</Page>
-		</Pages>
-	</Page>
-	<Page name="ecMyEcommerce" hidden="true" enabled="false" roles="Reseller,User">
-		<Pages>
-			<Page name="ecPaymentProfile" roles="Reseller,User" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecCustomerPaymentProfile" title="ecCustomerPaymentProfile" />
-				</Content>
-			</Page>
-			<Page name="ecMyPayments" roles="Reseller,User" adminskin="Browse1.ascx" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecCustomersPayments" title="ecMyPayments">
-						<Settings>
-							<Add name="IsReseller" value="False" />
-						</Settings>
-					</Module>
-				</Content>
-			</Page>
-			<Page name="ecMyInvoices" roles="Reseller,User" adminskin="Browse1.ascx" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecCustomersInvoices" title="ecMyInvoices">
-						<Settings>
-							<Add name="IsReseller" value="False" />
-						</Settings>
-					</Module>
-				</Content>
-			</Page>
-			<Page name="ecMyServices" roles="Reseller,User" adminskin="Browse1.ascx" skin="Browse2.ascx">
-				<Content id="LeftPane">
-					<Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-						<ModuleData ref="UserMenu"/>
-					</Module>
-				</Content>
-				<Content id="ContentPane">
-					<Module moduleDefinitionID="ecCustomersServices" title="ecMyServices">
-						<Settings>
-							<Add name="IsReseller" value="False" />
-						</Settings>
-					</Module>
-				</Content>
-			</Page>
-		</Pages>
-	</Page>
-</Pages>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/ModulesData.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/ModulesData.config
deleted file mode 100644
index 54627906..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/ModulesData.config
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ModulesData>
-
-	<ModuleData id="UserMenu">
-		<MenuItem pageID="Home" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" selectedUserContext="User"/>
-		<MenuItem pageID="UserCustomers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" selectedUserContext="Administrator,Reseller"/>
-		<MenuItem pageID="UserSpaces" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" selectedUserContext="Administrator,Reseller,User"/>
-		<MenuItem pageID="HostingPlans" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" selectedUserContext="Administrator,Reseller"/>
-		<MenuItem pageID="HostingAddons" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" selectedUserContext="Administrator,Reseller"/>
-		<MenuItem pageID="UserPeers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" selectedUserContext="Administrator,Reseller,User"/>
-		<MenuItem pageID="UserTasks" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" selectedUserContext="Administrator,Reseller,User"/>
-		<MenuItem pageID="AuditLog" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" selectedUserContext="Administrator,Reseller,User"/>
-		<MenuItem pageID="ecOnlineStore" roles="Reseller,ResellerCSR,ResellerHelpdesk,User" selectedUserContext="Reseller,User" ecuser="true" />
-		<MenuItem pageID="ecEcommerceAdmin" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" selectedUserContext="Administrator,Reseller,User" ecadmin="true">
-			<MenuItems>
-				<MenuItem pageID="ecEcommerceSettings" ecommerce="true" />
-				<MenuItem pageID="ecBillingCycles" />
-				<MenuItem pageID="ecHostingPlans" />
-				<MenuItem pageID="ecHostingAddons" />
-				<MenuItem pageID="ecDomainNames" />
-				<MenuItem pageID="ecTaxations" />
-				<MenuItem pageID="ecCategories" />
-				<MenuItem pageID="ecCustomersPayments" />
-				<MenuItem pageID="ecCustomersInvoices" />
-				<MenuItem pageID="ecCustomersServices" />
-			</MenuItems>
-		</MenuItem>
-		<MenuItem pageID="ecMyEcommerce" ecuser="true" roles="Reseller,ResellerCSR,ResellerHelpdesk,User" selectedUserContext="Reseller,User">
-			<MenuItems>
-				<MenuItem pageID="ecPaymentProfile" />
-				<MenuItem pageID="ecMyPayments" />
-				<MenuItem pageID="ecMyInvoices" />
-				<MenuItem pageID="ecMyServices" />
-			</MenuItems>
-		</MenuItem>
-		<!--MenuItem url="http://google.com" title="Google" target="_blank"/-->
-	</ModuleData>
-
-	<ModuleData id="SpaceMenu">
-		
-		<MenuItem pageID="SpaceDomains" resourceGroup="OS" />
-		<MenuItem pageID="SpaceWebSites" resourceGroup="Web"/>
-		<MenuItem pageID="SpaceWebIPAddresses" resourceGroup="Web" />
-		<MenuItem pageID="SpaceFtpAccounts" resourceGroup="FTP"/>
-		<MenuItem pageID="SpaceMail" resourceGroup="Mail" disabled="True">
-			<MenuItems>
-				<MenuItem pageID="SpaceMailAccounts" quota="Mail.Accounts"/>
-				<MenuItem pageID="SpaceMailForwardings" quota="Mail.Forwardings"/>
-				<MenuItem pageID="SpaceMailGroups" quota="Mail.Groups"/>
-				<MenuItem pageID="SpaceMailLists" quota="Mail.Lists"/>
-				<MenuItem pageID="SpaceMailDomains"  resourceGroup="Mail"/>
-			</MenuItems>
-		</MenuItem>
-		<MenuItem pageID="SpaceDatabases" disabled="True">
-			<MenuItems>
-				<MenuItem pageID="SpaceMsSql2000" resourceGroup="MsSQL2000"/>
-				<MenuItem pageID="SpaceMsSql2005" resourceGroup="MsSQL2005"/>
-				<MenuItem pageID="SpaceMsSql2008" resourceGroup="MsSQL2008"/>
-				<MenuItem pageID="SpaceMsSql2012" resourceGroup="MsSQL2012"/>
-                <MenuItem pageID="SpaceMsSql2014" resourceGroup="MsSQL2014"/>
-				<MenuItem pageID="SpaceMySql4" resourceGroup="MySQL4"/>
-				<MenuItem pageID="SpaceMySql5" resourceGroup="MySQL5"/>
-			</MenuItems>
-		</MenuItem>
-		<MenuItem pageID="SpaceSharePoint" resourceGroup="SharePoint" disabled="True">
-			<MenuItems>
-				<MenuItem pageID="SpaceSharePointSites"/>
-				<MenuItem pageID="SpaceSharePointUsers"/>
-			</MenuItems>
-		</MenuItem>
-		<MenuItem pageID="SpaceVPS" resourceGroup="VPS"/>
-		<MenuItem pageID="SpaceVPSForPC" resourceGroup="VPSForPC"/>
-		<MenuItem pageID="SpaceExchangeServer" resourceGroup="Hosted Organizations"/>
-		<MenuItem pageID="SpaceSharedSSL" resourceGroup="OS" quota="Web.SharedSSL"/>
-		<MenuItem pageID="SpaceAdvancedStatistics" resourceGroup="Statistics"/>
-		<MenuItem pageID="SpaceOdbc" resourceGroup="OS" quota="OS.ODBC"/>
-		<MenuItem pageID="SpaceFileManager" resourceGroup="OS" quota="OS.FileManager"/>
-		<MenuItem pageID="SpaceWebApplicationsGallery" resourceGroup="Web" quota="Web.WebAppGallery"/>
-		<MenuItem pageID="SpaceApplicationsInstaller" resourceGroup="OS" quota="OS.AppInstaller"/>
-		<MenuItem pageID="SpaceScheduledTasks" resourceGroup="OS" quota="OS.ScheduledTasks"/>
-    <!--CO Changes-->
-    <MenuItem pageID="SpaceApplyEnableHardQuotaFeature" resourceGroup="OS" quota=""/>
-    <!--END-->
-		<!--MenuItem url="http://phpmysqladmin.com" title="phpMyAdmin" target="_blank"
-                resourceGroup="MySQL4"/-->
-
-    <MenuItem pageID="LyncPhoneNumbers" resourceGroup="Hosted Organizations" />
-
-  </ModuleData>
-
-	<ModuleData id="SpaceIcons">
-    <Group pageID="SpaceHome" titleresourcekey="System">
-      <Icon pageID="SpaceHome" titleresourcekey="SpaceStatistics" imageUrl="icons/spacehome_48.png" />
-      <Icon pageID="SpaceDomains" resourceGroup="OS" imageUrl="icons/domains_48.png" />
-      <Icon pageID="SpaceFtpAccounts" resourceGroup="FTP" imageUrl="icons/ftp_48.png"/>
-      <Icon pageID="SpaceFileManager" resourceGroup="OS" quota="OS.FileManager" imageUrl="icons/filemanager_48.png"/>
-      <Icon pageID="SpaceApplicationsInstaller" resourceGroup="OS" quota="OS.AppInstaller" imageUrl="icons/applicationsinstaller_48.png"/>
-      <Icon pageID="SpaceScheduledTasks" resourceGroup="OS" quota="OS.ScheduledTasks" imageUrl="icons/scheduledtasks_48.png"/>
-    </Group>
-    <Group pageID="SpaceWeb" titleresourcekey="Web" disabled="True">
-      <Icon pageID="SpaceWebSites" resourceGroup="Web" imageUrl="icons/websites_48.png" />
-      <Icon pageID="SpaceWebIPAddresses" resourceGroup="Web" imageUrl="icons/webipaddresses_48.png" />
-      <Icon pageID="SpaceSharedSSL" resourceGroup="OS" quota="Web.SharedSSL" imageUrl="icons/sharedssl_48.png" />
-      <Icon pageID="SpaceAdvancedStatistics" resourceGroup="Statistics" imageUrl="icons/advancedstatistics_48.png" />
-      <Icon pageID="SpaceWebApplicationsGallery" resourceGroup="Web" quota="Web.WebAppGallery" imageUrl="icons/webapplicationsgallery_48.png"/>
-    </Group>
-    <Group pageID="SpaceMail" titleresourcekey="Email" resourceGroup="Mail" disabled="True">
-      <Icon pageID="SpaceMailAccounts" quota="Mail.Accounts" imageUrl="icons/mail_accounts_48.png"/>
-      <Icon pageID="SpaceMailForwardings" quota="Mail.Forwardings" imageUrl="icons/mail_forwardings_48.png"/>
-      <Icon pageID="SpaceMailGroups" quota="Mail.Groups" imageUrl="icons/mail_groups_48.png"/>
-      <Icon pageID="SpaceMailLists" quota="Mail.Lists" imageUrl="icons/mail_lists_48.png"/>
-      <Icon pageID="SpaceMailDomains"  resourceGroup="Mail" imageUrl="icons/mail_domains_48.png"/>
-    </Group>
-    <Group pageID="SpaceDatabases" titleresourcekey="Databases" disabled="True">
-      <Icon pageID="SpaceMsSql2000" resourceGroup="MsSQL2000" imageUrl="icons/mssql_48.png"/>
-      <Icon pageID="SpaceMsSql2005" resourceGroup="MsSQL2005" imageUrl="icons/mssql_48.png"/>
-      <Icon pageID="SpaceMsSql2008" resourceGroup="MsSQL2008" imageUrl="icons/mssql_48.png"/>
-      <Icon pageID="SpaceMsSql2012" resourceGroup="MsSQL2012" imageUrl="icons/mssql_48.png"/>
-      <Icon pageID="SpaceMsSql2014" resourceGroup="MsSQL2014" imageUrl="icons/mssql_48.png"/>
-      <Icon pageID="SpaceMySql4" resourceGroup="MySQL4" imageUrl="icons/mysql_48.png"/>
-      <Icon pageID="SpaceMySql5" resourceGroup="MySQL5" imageUrl="icons/mysql_48.png"/>
-      <Icon pageID="SpaceOdbc" resourceGroup="OS" quota="OS.ODBC" imageUrl="icons/odbc_48.png"/>
-    </Group>
-    <Group pageID="SpaceHome" titleresourcekey="VPS" disabled="True">
-      <Icon pageID="SpaceVPS" resourceGroup="VPS" imageUrl="icons/vps_48.png" />
-      <Icon pageID="SpaceVPSForPC" resourceGroup="VPSForPC" imageUrl="icons/vpsforpc_48.png" />
-    </Group>
-    <!-- 
-    <Group pageID="SpaceSharePoint" resourceGroup="SharePoint" disabled="True">
-      <Icon pageID="SpaceSharePointSites" imageUrl="icons/colors_48.png"/>
-      <Icon pageID="SpaceSharePointUsers" imageUrl="icons/colors_48.png"/>
-		</Group>
-    -->
-	</ModuleData>
-
-	<ModuleData id="HostedSolutionMenu">
-		<MenuItem pageID="SpaceDomains"/>
-		<MenuItem pageID="Userds"/>
-		<MenuItem pageID="SpaceOrganizationHostedSharePoint" resourceGroup="Hosted SharePoint"/>
-		<MenuItem pageID="SpaceExchanged"/>
-	</ModuleData>
-
-</ModulesData>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SiteSettings.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SiteSettings.config
deleted file mode 100644
index 4fc71ff6..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SiteSettings.config
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<SiteSettings>
-	<!-- Display Settings -->
-	<PortalName>WebsitePanel</PortalName>
-	<!-- Enterprise Server -->
-	<EnterpriseServer>http://localhost:9002</EnterpriseServer>
-	<!-- General Settings -->
-	<CultureCookieName>UserCulture</CultureCookieName>
-	<ThemeCookieName>UserTheme</ThemeCookieName>
-	<!-- Mail Settings -->
-	<AdminEmail>
-	</AdminEmail>
-	<SmtpHost>
-	</SmtpHost>
-	<SmtpPort>
-	</SmtpPort>
-	<SmtpUsername>
-	</SmtpUsername>
-	<SmtpPassword>
-	</SmtpPassword>
-	<FromEmail>
-	</FromEmail>
-	<!-- Pages -->
-	<DefaultPage>Home</DefaultPage>
-	<LoginPage>Login</LoginPage>
-	<UserHomePage>Home</UserHomePage>
-	<UserCustomersPage>UserCustomers</UserCustomersPage>
-	<SpaceHomePage>SpaceHome</SpaceHomePage>
-	<NestedSpacesPage>NestedSpaces</NestedSpacesPage>
-	<UsersSearchPage>SearchUsers</UsersSearchPage>
-	<SpacesSearchPage>SearchSpaces</SpacesSearchPage>
-	<LoggedUserAccountPage>LoggedUserDetails</LoggedUserAccountPage>
-	<!-- Skins and Containers -->
-	<PortalSkin>Browse2.ascx</PortalSkin>
-	<PortalContainer>Browse.ascx</PortalContainer>
-	<AdminSkin>Edit.ascx</AdminSkin>
-	<AdminContainer>Edit.ascx</AdminContainer>
-	<!-- SSL Settings -->
-	<UseSSL>false</UseSSL>
-  <HideDemoCheckbox>false</HideDemoCheckbox>
-  <HideThemeAndLocale>false</HideThemeAndLocale>
-  <ExcludedRolesToLogin></ExcludedRolesToLogin>
-</SiteSettings>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SupportedLocales.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SupportedLocales.config
deleted file mode 100644
index aec48dea..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SupportedLocales.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<SupportedLocales>
-	<Locale name="English" key="en-US" fallback="" />
-</SupportedLocales>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SupportedThemes.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SupportedThemes.config
deleted file mode 100644
index 1c602e46..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SupportedThemes.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Themes>
-	<Theme name="Default" title="Energy Blue" />
-</Themes>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/WebsitePanel_Modules.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/WebsitePanel_Modules.config
deleted file mode 100644
index b43e286a..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/WebsitePanel_Modules.config
+++ /dev/null
@@ -1,664 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ModuleDefinitions>
-
-	<!-- Common Modules -->
-	<ModuleDefinition id="SystemSettings">
-		<Controls>
-			<Control key="" src="WebsitePanel/SystemSettings.ascx" title="SearchUsers" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="TextHTML">
-		<Controls>
-			<Control key="" src="WebsitePanel/TextHTML.ascx" title="TextHTML" type="View" />
-		</Controls>
-	</ModuleDefinition>
-
-	<!-- Common Modules -->
-	<ModuleDefinition id="SearchUsers">
-		<Controls>
-			<Control key="" src="WebsitePanel/SearchUsers.ascx" title="SearchUsers" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SearchSpaces">
-		<Controls>
-			<Control key="" src="WebsitePanel/SearchSpaces.ascx" title="SearchSpaces" type="View" />
-		</Controls>
-	</ModuleDefinition>
-
-	<!-- User Account -->
-	<ModuleDefinition id="LoggedUserDetails">
-		<Controls>
-			<Control key="" src="WebsitePanel/LoggedUserEditDetails.ascx" title="LoggedUserDetails" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="UserAccountMenu">
-		<Controls>
-			<Control key="" src="WebsitePanel/UserAccountMenu.ascx" title="UserAccountMenu" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="UserCustomers">
-		<Controls>
-			<Control key="" src="WebsitePanel/UserCustomers.ascx" title="UserCustomersSummary" type="View" />
-			<Control key="create_user" src="WebsitePanel/UserCreateUserAccount.ascx" title="UserCreateUserAccount" type="View" icon="user_add_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="UserCustomersSummary">
-		<Controls>
-			<Control key="" src="WebsitePanel/UserCustomersSummary.ascx" title="UserCustomersSummary" type="View" />
-			<Control key="create_user" src="WebsitePanel/UserCreateUserAccount.ascx" title="UserCreateUserAccount" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="UserSpaces">
-		<Controls>
-			<Control key="" src="WebsitePanel/UserSpaces.ascx" title="UserSpaces" type="View" />
-			<Control key="create_space" src="WebsitePanel/UserCreateSpace.ascx" title="UserCreateSpace" type="View" icon="sphere_add_48.png" />
-		</Controls>
-	</ModuleDefinition>
-  <ModuleDefinition id="UserNotes">
-		<Controls>
-			<Control key="" src="WebsitePanel/UserAccountNotes.ascx" title="UserAccountNotes" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="UserDetails">
-		<Controls>
-			<Control key="" src="WebsitePanel/UserAccountDetails.ascx" title="UserAccountDetails" type="View" />
-			<Control key="summary_letter" src="WebsitePanel/UserAccountSummaryLetter.ascx" title="UserAccountSummaryLetter" type="View" icon="admin_info_48.png" />
-			<Control key="edit_details" src="WebsitePanel/UserAccountEditDetails.ascx" title="UserAccountEditDetails" type="View" icon="admin_write_48.png" />
-			<Control key="change_password" src="WebsitePanel/UserAccountChangePassword.ascx" title="UserAccountChangePassword" type="View" icon="admin_lock_48.png" />
-			<Control key="delete" src="WebsitePanel/UserDeleteUserAccount.ascx" title="UserDeleteUserAccount" type="View" icon="admin_close_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="UserResellerSettings">
-		<Controls>
-			<Control key="" src="WebsitePanel/UserAccountSettings.ascx" title="UserAccountSettings" type="View" />
-			<Control key="mail_templates" src="WebsitePanel/UserAccountMailTemplateSettings.ascx" title="UserAccountMailTemplateSettings" type="View" icon="user_config_48.png" />
-			<Control key="policies" src="WebsitePanel/UserAccountPolicySettings.ascx" title="UserAccountPolicySettings" type="View" icon="user_config_48.png" />
-			<Control key="edit_settings" src="WebsitePanel/SettingsEditor.ascx" title="UserAccountSettingsEditor" type="View" icon="user_config_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="UserTools">
-		<Controls>
-			<Control key="" src="WebsitePanel/UserAccountTools.ascx" title="UserAccountTools" type="View" />
-			<Control key="backup" src="WebsitePanel/BackupWizard.ascx" title="BackupUser" type="View" />
-			<Control key="restore" src="WebsitePanel/RestoreWizard.ascx" title="RestoreUser" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="Tasks">
-		<Controls>
-			<Control key="" src="WebsitePanel/Tasks.ascx" title="Tasks" type="View" />
-			<Control key="view_details" src="WebsitePanel/TasksTaskDetails.ascx" title="TasksTaskDetails" type="View" icon="hourglass_48.png" />
-		</Controls>
-	</ModuleDefinition>
-
-
-	<!-- Space -->
-	<ModuleDefinition id="SpaceMenu">
-		<Controls>
-			<Control key="" src="WebsitePanel/SpaceMenu.ascx" title="SpaceMenu" type="View" />
-		</Controls>
-	</ModuleDefinition>
-
-	<ModuleDefinition id="HostedSolutionMenu">
-		<Controls>
-			<Control key="" src="WebsitePanel/SpaceMenu.ascx" title="SpaceMenu" type="View" />
-		</Controls>
-	</ModuleDefinition>
-
-	<ModuleDefinition id="SpaceQuotas">
-		<Controls>
-			<Control key="" src="WebsitePanel/SpaceQuotas.ascx" title="SpaceQuotas" type="View" />
-			<Control key="view_quotas" src="WebsitePanel/SpaceViewQuotas.ascx" title="SpaceViewQuotas" type="View" icon="sphere_level_48.png" />
-			<Control key="view_addon" src="WebsitePanel/SpaceViewAddon.ascx" title="SpaceViewAddon" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SpaceNestedSpacesSummary">
-		<Controls>
-			<Control key="" src="WebsitePanel/SpaceNestedSpacesSummary.ascx" title="SpaceNestedSpacesSummary" type="View" />
-			<Control key="spaces" src="WebsitePanel/SpaceNestedSpaces.ascx" title="SpaceNestedSpaces" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SpaceNotes">
-		<Controls>
-			<Control key="" src="WebsitePanel/SpaceNotes.ascx" title="SpaceNotes" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SpaceDetails">
-		<Controls>
-			<Control key="" src="WebsitePanel/SpaceDetails.ascx" title="SpaceDetails" type="View" />
-			<Control key="edit_details" src="WebsitePanel/SpaceEditDetails.ascx" title="SpaceEditDetails" type="View" icon="sphere_write_48.png" />
-			<Control key="summary_letter" src="WebsitePanel/SpaceSummaryLetter.ascx" title="SpaceSummaryLetter" type="View" icon="sphere_info_48.png" />
-			<Control key="delete" src="WebsitePanel/SpaceDeleteSpace.ascx" title="SpaceDeleteSpace" type="View" icon="sphere_close_48.png" />
-			<Control key="edit_addon" src="WebsitePanel/SpaceEditAddon.ascx" title="SpaceEditAddon" type="View" icon="sphere_star_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SpaceSettings">
-		<Controls>
-			<Control key="" src="WebsitePanel/SpaceSettings.ascx" title="SpaceSettings" type="View" />
-			<Control key="edit_settings" src="WebsitePanel/SpaceSettingsEditor.ascx" title="SpaceSettingsEditor" type="View" icon="sphere_config_48.png" />
-			<Control key="edit_globaldns" src="WebsitePanel/SpaceEditDnsRecords.ascx" title="SpaceEditDnsRecords" type="View" icon="sphere_config_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SpaceTools">
-		<Controls>
-			<Control key="" src="WebsitePanel/SpaceTools.ascx" title="SpaceTools" type="View" />
-			<Control key="backup" src="WebsitePanel/BackupWizard.ascx" title="BackupSpace" type="View" />
-			<Control key="restore" src="WebsitePanel/RestoreWizard.ascx" title="RestoreSpace" type="View" />
-			<Control key="import" src="WebsitePanel/SpaceImportResources.ascx" title="ImportSpaceResources" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="NestedSpaces">
-		<Controls>
-			<Control key="" src="WebsitePanel/SpaceNestedSpaces.ascx" title="SpaceNestedSpaces" type="View" />
-		</Controls>
-	</ModuleDefinition>
-
-
-	<ModuleDefinition id="IPAddresses">
-		<Controls>
-			<Control key="" src="WebsitePanel/IPAddresses.ascx" title="IPAddressesManager" type="View" />
-			<Control key="add_ip" src="WebsitePanel/IPAddressesAddIPAddress.ascx" title="AddIPAddress" type="View" icon="adress_add_48.png" />
-			<Control key="edit_ip" src="WebsitePanel/IPAddressesEditIPAddress.ascx" title="EditIPAddress" type="View" icon="adress_48.png" />
-		</Controls>
-	</ModuleDefinition>
-
-  <ModuleDefinition id="PhoneNumbers">
-    <Controls>
-      <Control key="" src="WebsitePanel/PhoneNumbers.ascx" title="PhoneNumbers" type="View" />
-      <Control key="add_phone" src="WebsitePanel/PhoneNumbersAddPhoneNumber.ascx" title="AddPhoneNumber" type="View" icon="adress_add_48.png" />
-      <Control key="edit_phone" src="WebsitePanel/PhoneNumbersEditPhoneNumber.ascx" title="EditPhoneNumber" type="View" icon="adress_48.png" />
-    </Controls>
-  </ModuleDefinition>
-  
-  <ModuleDefinition id="RDSServers">
-    <Controls>
-      <Control key="" src="WebsitePanel/RDSServers.ascx" title="RDSServers" type="View" />
-      <Control key="add_rdsserver" src="WebsitePanel/RDSServersAddserver.ascx" title="RDSServersAddserver" type="View" icon="computer_add_48.png" />
-    </Controls>
-  </ModuleDefinition>
-
-  <ModuleDefinition id="Servers">
-		<Controls>
-			<Control key="" src="WebsitePanel/Servers.ascx" title="Servers" type="View" />
-			<Control key="add_ip" src="WebsitePanel/IPAddressesAddIPAddress.ascx" title="AddIPAddress" type="View" icon="adress_add_48.png" />
-			<Control key="add_server" src="WebsitePanel/ServersAddServer.ascx" title="AddServer" type="View" icon="computer_add_48.png" />
-			<Control key="add_service" src="WebsitePanel/ServersAddService.ascx" title="AddNewService" type="View" icon="computer_config_48.png" />
-			<Control key="edit_eventviewer" src="WebsitePanel/ServersEditEventViewer.ascx" title="ServerEventViewer" type="View" icon="table_48.png" />
-			<Control key="edit_ip" src="WebsitePanel/IPAddressesEditIPAddress.ascx" title="EditIPAddress" type="View" icon="adress_48.png" />
-			<Control key="edit_processes" src="WebsitePanel/ServersEditSystemProcesses.ascx" title="ManageServerSystemProcesses" type="View" icon="windows_window_48.png" />
-			<Control key="edit_reboot" src="WebsitePanel/ServersEditReboot.ascx" title="RebootServer" type="View" icon="switch_off_48.png" />
-			<Control key="edit_server" src="WebsitePanel/ServersEditServer.ascx" title="ServerProperties" type="View" icon="computer_48.png" />
-			<Control key="edit_service" src="WebsitePanel/ServersEditService.ascx" title="ServiceProperties" type="View" icon="computer_config_48.png" />
-			<Control key="edit_termservices" src="WebsitePanel/ServersEditTerminalConnections.ascx" title="ManageTerminalConnections" type="View" icon="windows_window_zoom_48.png" />
-			<Control key="edit_winservices" src="WebsitePanel/ServersEditWindowsServices.ascx" title="ManageWindowsServices" type="View" icon="windows_window_config_48.png" />
-      <Control key="edit_platforminstaller" src="WebsitePanel/ServersEditWebPlatformInstaller.ascx" title="ManagePlatformInstaller" type="View" icon="computer_config_48.png" />
-      <Control key="backup" src="WebsitePanel/BackupWizard.ascx" title="BackupServer" type="View" />
-			<Control key="restore" src="WebsitePanel/RestoreWizard.ascx" title="RestoreServer" type="View" />
-			<Control key="edit_htaccessfolder" src="WebsitePanel/WebSitesEditHeliconApeFolder.ascx" title="HeliconApeFolderProperties" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="VirtualServers">
-		<Controls>
-			<Control key="" src="WebsitePanel/VirtualServers.ascx" title="VirtualServers" type="View" />
-			<Control key="add_server" src="WebsitePanel/VirtualServersAddServer.ascx" title="AddNewVirtualServer" type="View" icon="network_add_48.png" />
-			<Control key="add_services" src="WebsitePanel/VirtualServersAddServices.ascx" title="AddVirtualServerServices" type="View" icon="network_config_48.png" />
-			<Control key="edit_server" src="WebsitePanel/VirtualServersEditServer.ascx" title="EditVirtualServer" type="View" icon="network_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="MyUsers">
-		<Controls>
-			<Control key="" src="WebsitePanel/Users.ascx" title="Users" type="View" />
-			<Control key="delete_user" src="WebsitePanel/UsersDeleteUser.ascx" title="DeleteUserAccount" type="View" />
-			<Control key="edit_user" src="WebsitePanel/UsersEditUser.ascx" title="EditUserDetails" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="UserPeers">
-		<Controls>
-			<Control key="" src="WebsitePanel/Peers.ascx" title="PeerAccounts" type="View" />
-			<Control key="edit_peer" src="WebsitePanel/PeersEditPeer.ascx" title="EditPeerAccount" type="View" icon="motion_blur_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="HostingPlans">
-		<Controls>
-			<Control key="" src="WebsitePanel/HostingPlans.ascx" title="HostingPlans" type="View" />
-			<Control key="edit_plan" src="WebsitePanel/HostingPlansEditPlan.ascx" title="EditHostingPlan" type="View" icon="inventory_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="HostingAddons">
-		<Controls>
-			<Control key="" src="WebsitePanel/HostingAddons.ascx" title="HostingAddOns" type="View" />
-			<Control key="edit_addon" src="WebsitePanel/HostingAddonsEditAddon.ascx" title="EditHostingAddOn" type="View" icon="inventory_add_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="Domains">
-		<Controls>
-			<Control key="" src="WebsitePanel/Domains.ascx" title="Domains" type="View" />
-			<Control key="add_domain" src="WebsitePanel/DomainsAddDomainSelectType.ascx" title="AddNewDomain" type="View" icon="world_add_48.png" />
-			<Control key="add_domain_step2" src="WebsitePanel/DomainsAddDomain.ascx" title="AddNewDomain" type="View" icon="world_add_48.png" />
-			<Control key="edit_item" src="WebsitePanel/DomainsEditDomain.ascx" title="EditDomain" type="View" icon="world_48.png" />
-			<Control key="zone_records" src="WebsitePanel/DnsZoneRecords.ascx" title="DNSZoneRecords" type="View" icon="world_48.png" />
-		</Controls>
-	</ModuleDefinition>
-
-
-
-	<ModuleDefinition id="HostedSharePointSiteCollections">
-		<Controls>
-			<Control key="" src="WebsitePanel/HostedSharePointSiteCollections.ascx" title="HostedSharePointSiteCollections" type="View"  icon="colors_48.png"/>
-			<Control key="edit_item" src="WebsitePanel/HostedSharePointEditSiteCollection.ascx" title="HostedSharePointSiteCollection" type="View" icon="colors_48.png" />
-			<Control key="backup" src="WebsitePanel/HostedSharePointBackupSiteCollection.ascx" title="HostedSharePointBackupSiteCollection" type="View"/>
-			<Control key="restore" src="WebsitePanel/HostedSharePointRestoreSiteCollection.ascx" title="HostedSharePointRestoreSiteCollection" type="View"/>
-		</Controls>
-	</ModuleDefinition>
-
-
-	<ModuleDefinition id="FileManager">
-		<Controls>
-			<Control key="" src="WebsitePanel/FileManager.ascx" title="HostingSpaceFiles" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="WebSites">
-		<Controls>
-			<Control key="" src="WebsitePanel/WebSites.ascx" title="WebSites" type="View" />
-			<Control key="add_pointer" src="WebsitePanel/WebSitesAddPointer.ascx" title="AddWebSiteDomainPointer" type="View" />
-			<Control key="add_site" src="WebsitePanel/WebSitesAddSite.ascx" title="AddWebSite" type="View" icon="location_add_48.png" />
-			<Control key="add_vdir" src="WebsitePanel/WebSitesAddVirtualDir.ascx" title="AddVirtualDirectory" type="View" icon="file_add_48.png" />
-			<Control key="edit_item" src="WebsitePanel/WebSitesEditSite.ascx" title="WebSiteProperties" type="View" icon="location_48.png" />
-			<Control key="edit_vdir" src="WebsitePanel/WebSitesEditVirtualDir.ascx" title="VirtualDirectoryProperties" type="View" icon="file_48.png" />
-			<Control key="edit_webfolder" src="WebsitePanel/WebSitesEditWebFolder.ascx" title="SecuredFolderProperties" type="View" />
-			<Control key="edit_webgroup" src="WebsitePanel/WebSitesEditWebGroup.ascx" title="SecureGroupProperties" type="View" />
-			<Control key="edit_webuser" src="WebsitePanel/WebSitesEditWebUser.ascx" title="SecureUserProperties" type="View" />
-			<Control key="add_domain" src="WebsitePanel/DomainsAddDomain.ascx" title="AddDomain" type="View" />
-			<Control key="edit_htaccessfolder"     src="WebsitePanel/WebSitesEditHeliconApeFolder.ascx" title="HeliconApeFolderProperties" type="View" />
-			<Control key="edit_htaccessfolderauth" src="WebsitePanel/WebSitesEditHeliconApeFolderAuth.ascx" title="HeliconApeFolderAuthProperties" type="View" />
-			<Control key="edit_htaccessgroup"  src="WebsitePanel/WebSitesEditHeliconApeGroup.ascx"  title="HeliconApeGroupProperties" type="View" />
-			<Control key="edit_htaccessuser"   src="WebsitePanel/WebSitesEditHeliconApeUser.ascx"   title="HeliconApeUserProperties" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="WebSiteIPAddresses">
-		<Controls>
-			<Control key="" src="WebsitePanel/WebSitesIPAddresses.ascx" title="WebSitesIPAddresses" type="View" />
-			<Control key="allocate_addresses" src="WebsitePanel/WebSitesAllocateIPAddresses.ascx" title="WebSitesAllocateIPAddresses" type="View" />
-		</Controls>
-	</ModuleDefinition>
-  <ModuleDefinition id="LyncPhoneNumbers">
-    <Controls>
-      <Control key="" src="WebsitePanel/LyncPhoneNumbers.ascx" title="LyncPhoneNumbers" type="View" />
-    </Controls>
-  </ModuleDefinition>
-  <ModuleDefinition id="FtpAccounts">
-		<Controls>
-			<Control key="" src="WebsitePanel/FtpAccounts.ascx" title="FTPAccounts" type="View" />
-			<Control key="edit_item" src="WebsitePanel/FtpAccountEditAccount.ascx" title="FTPAccountProperties" type="View" icon="folder_up_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="MailAccounts">
-		<Controls>
-			<Control key="" src="WebsitePanel/MailAccounts.ascx" title="MailAccounts" type="View" />
-			<Control key="add_domain" src="WebsitePanel/DomainsAddDomain.ascx" title="AddNewDomain" type="View" icon="" />
-			<Control key="edit_item" src="WebsitePanel/MailAccountsEditAccount.ascx" title="MailAccountProperties" type="View" icon="accounting_mail_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="MailForwardings">
-		<Controls>
-			<Control key="" src="WebsitePanel/MailForwardings.ascx" title="MailForwardings" type="View" />
-			<Control key="add_domain" src="WebsitePanel/DomainsAddDomain.ascx" title="AddNewDomain" type="View" />
-			<Control key="edit_item" src="WebsitePanel/MailForwardingsEditForwarding.ascx" title="MailForwardingProperties" type="View" icon="safe-mail_next_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="MailGroups">
-		<Controls>
-			<Control key="" src="WebsitePanel/MailGroups.ascx" title="MailGroups" type="View" />
-			<Control key="add_domain" src="WebsitePanel/DomainsAddDomain.ascx" title="AddNewDomain" type="View" />
-			<Control key="edit_item" src="WebsitePanel/MailGroupsEditGroup.ascx" title="MailGroupProperties" type="View" icon="contacts_mail_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="MailLists">
-		<Controls>
-			<Control key="" src="WebsitePanel/MailLists.ascx" title="MailLists" type="View" />
-			<Control key="add_domain" src="WebsitePanel/DomainsAddDomain.ascx" title="AddNewDomain" type="View" />
-			<Control key="edit_item" src="WebsitePanel/MailListsEditList.ascx" title="MailListProperties" type="View" icon="discussion_group_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="MailDomains">
-		<Controls>
-			<Control key="" src="WebsitePanel/MailDomains.ascx" title="MailDomains" type="View" />
-			<Control key="add_domain" src="WebsitePanel/DomainsAddDomain.ascx" title="AddNewDomain" type="View" />
-			<Control key="add_pointer" src="WebsitePanel/MailDomainsAddPointer.ascx" title="AddMailDomainPointer" type="View" />
-			<Control key="edit_item" src="WebsitePanel/MailDomainsEditDomain.ascx" title="MailDomainProperties" type="View" icon="web_mail_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SqlDatabases">
-		<Controls>
-			<Control key="" src="WebsitePanel/SqlDatabases.ascx" title="SQLDatabases" type="View" />
-			<Control key="backup" src="WebsitePanel/SqlBackupDatabase.ascx" title="BackupSQLDatabase" type="View" icon="database2_save_48.png" />
-			<Control key="edit_item" src="WebsitePanel/SqlEditDatabase.ascx" title="SQLDatabaseProperties" type="View" icon="database2_48.png" />
-			<Control key="restore" src="WebsitePanel/SqlRestoreDatabase.ascx" title="RestoreSQLDatabase" type="View" icon="database2_reload_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SqlUsers">
-		<Controls>
-			<Control key="" src="WebsitePanel/SqlUsers.ascx" title="SQLUsers" type="View" />
-			<Control key="edit_item" src="WebsitePanel/SqlEditUser.ascx" title="SQLUserProperties" type="View" icon="db_user_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SharePointUsers">
-		<Controls>
-			<Control key="" src="WebsitePanel/SharePointUsers.ascx" title="SharePointUsers" type="View" />
-			<Control key="edit_item" src="WebsitePanel/SharePointUsersEditUser.ascx" title="SharePointUserProperties" type="View" icon="user_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SharePointGroups">
-		<Controls>
-			<Control key="" src="WebsitePanel/SharePointGroups.ascx" title="SharePointGroups" type="View" />
-			<Control key="edit_item" src="WebsitePanel/SharePointGroupsEditGroup.ascx" title="SharePointGroup" type="View" icon="group_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="AdvancedStatistics">
-		<Controls>
-			<Control key="" src="WebsitePanel/Statistics.ascx" title="AdvancedStatistics" type="View" />
-			<Control key="edit_item" src="WebsitePanel/StatisticsEditStatistics.ascx" title="AdvancedStatisticsInstallation" type="View" icon="stadistics_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="UsersWizard">
-		<Controls>
-			<Control key="" src="WebsitePanel/UsersCreationWizard.ascx" title="AccountCreationWizard" type="View" />
-			<Control key="complete" src="WebsitePanel/UsersCreationWizardComplete.ascx" title="AccountCreationComplete" type="View" />
-		</Controls>
-	</ModuleDefinition>
-
-	<ModuleDefinition id="WebApplicationsGallery">
-		<Controls>
-			<Control key="" src="WebsitePanel/WebApplicationGallery.ascx" title="WebApplicationsGallery" type="View" />
-			<Control key="complete" src="WebsitePanel/InstallerInstallApplicationComplete.ascx" title="InstallationComplete" type="View" icon="dvd_disc_ok_48.png" />
-			<Control key="edit" src="WebsitePanel/WebApplicationGalleryInstall.ascx" title="DownloadWebApplication" type="View" icon="dvd_disc_48.png" />
-			<Control key="editParams" src="WebsitePanel/WebApplicationGalleryParams.ascx" title="WebApplicationParameters" type="View" icon="dvd_disc_48.png" />
-
-		</Controls>
-	</ModuleDefinition>
-
-
-	<ModuleDefinition id="Login">
-		<Controls>
-			<Control key="" src="WebsitePanel/Login.ascx" title="SignIn" type="View" />
-			<Control key="forgot_password" src="WebsitePanel/LoginForgotPassword.ascx" title="PasswordReminder" type="View" />
-			<Control key="scpa" src="WebsitePanel/SetupControlPanelAccounts.ascx" title="SetupControlPanelAccounts" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="AuditLog">
-		<Controls>
-			<Control key="" src="WebsitePanel/AuditLog.ascx" title="AuditLog" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ScheduledTasks">
-		<Controls>
-			<Control key="" src="WebsitePanel/Schedules.ascx" title="ScheduledTasks" type="View" />
-			<Control key="edit" src="WebsitePanel/SchedulesEditSchedule.ascx" title="ScheduledTaskProperties" type="View" icon="calendar_month_2_clock_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="OverusageReport">
-		<Controls>
-			<Control key="" src="WebsitePanel/OverusageReport.ascx" title="OverusageReport" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="DiskspaceReport">
-		<Controls>
-			<Control key="" src="WebsitePanel/DiskspaceReport.ascx" title="DiskSpaceSummary" type="View" />
-			<Control key="edit" src="WebsitePanel/DiskspaceReportPackageDetails.ascx" title="HostingSpaceDiskSpaceDetails" type="View" icon="stadistics_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="BandwidthReport">
-		<Controls>
-			<Control key="" src="WebsitePanel/BandwidthReport.ascx" title="BandwidthReport" type="View" />
-			<Control key="edit" src="WebsitePanel/BandwidthReportPackageDetails.ascx" title="HostingSpaceBandwidthDetails" type="View" icon="stadistics_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="MyWeb">
-		<Controls>
-			<Control key="" src="WebsitePanel/IconsPad.ascx" title="Icons" type="View" />
-			<Control key="edit" src="WebsitePanel/IconsPadEditIcon.ascx" title="EditIconProperties" type="View" />
-			<Control key="settings" src="WebsitePanel/IconsPadSettings.ascx" title="IconsPadSettings" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="MyMail">
-		<Controls>
-			<Control key="" src="WebsitePanel/IconsPad.ascx" title="Icons" type="View" />
-			<Control key="edit" src="WebsitePanel/IconsPadEditIcon.ascx" title="EditIconProperties" type="View" />
-			<Control key="settings" src="WebsitePanel/IconsPadSettings.ascx" title="IconsPadSettings" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="MyDatabases">
-		<Controls>
-			<Control key="" src="WebsitePanel/IconsPad.ascx" title="Icons" type="View" />
-			<Control key="edit" src="WebsitePanel/IconsPadEditIcon.ascx" title="EditIconProperties" type="View" />
-			<Control key="settings" src="WebsitePanel/IconsPadSettings.ascx" title="IconsPadSettings" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="MyExtras">
-		<Controls>
-			<Control key="" src="WebsitePanel/IconsPad.ascx" title="Icons" type="View" />
-			<Control key="edit" src="WebsitePanel/IconsPadEditIcon.ascx" title="EditIconProperties" type="View" />
-			<Control key="settings" src="WebsitePanel/IconsPadSettings.ascx" title="IconsPadSettings" type="View" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="ODBC">
-		<Controls>
-			<Control key="" src="WebsitePanel/OdbcSources.ascx" title="ODBCDSNs" type="View" />
-			<Control key="edit_item" src="WebsitePanel/OdbcEditSource.ascx" title="ODBCDSNProperties" type="View" icon="export_db_back_48.png" />
-		</Controls>
-	</ModuleDefinition>
-	<ModuleDefinition id="SharePointSites">
-		<Controls>
-			<Control key="" src="WebsitePanel/SharePointSites.ascx" title="SharePointSites" type="View" />
-			<Control key="backup" src="WebsitePanel/SharePointBackupSite.ascx" title="BackupSharePointSite" type="View" />
-			<Control key="edit_item" src="WebsitePanel/SharePointEditSite.ascx" title="SharePointSite" type="View" icon="colors_48.png" />
-			<Control key="install_webparts" src="WebsitePanel/SharePointInstallWebPartPackage.ascx" title="InstallSharePointWebPartsPackage" type="View" />
-			<Control key="restore" src="WebsitePanel/SharePointRestoreSite.ascx" title="RestoreSharePointSite" type="View" />
-			<Control key="webparts" src="WebsitePanel/SharePointWebPartPackages.ascx" title="InstalledSharePointWebPartPackages" type="View" />
-		</Controls>
-	</ModuleDefinition>
-
-	<ModuleDefinition id="SharedSSL">
-		<Controls>
-			<Control key="" src="WebsitePanel/SharedSSLFolders.ascx" title="SharedSSLFolders" type="View" />
-			<Control key="add" src="WebsitePanel/SharedSSLAddFolder.ascx" title="AddSharedSSLFolder" type="View" icon="world_lock_48.png" />
-			<Control key="edit_item" src="WebsitePanel/SharedSSLEditFolder.ascx" title="SharedSSLFolderProperties" type="View" icon="world_lock_48.png" />
-		</Controls>
-	</ModuleDefinition>
-
-	<ModuleDefinition id="ExchangeServer">
-		<Controls>
-			<Control key="" src="WebsitePanel/ExchangeServer/Organizations.ascx" title="Organizations" type="View" />
-			<Control key="edit_user" src="WebsitePanel/ExchangeServer/OrganizationUserGeneralSettings.ascx" title="OrganizationUserGeneralSettings" type="View" />
-			<Control key="users" src="WebsitePanel/ExchangeServer/OrganizationUsers.ascx" title="OrganizationUsers" type="View" />
-			<Control key="create_user" src="WebsitePanel/ExchangeServer/OrganizationCreateUser.ascx" title="CreateUser" type="View" />
-			<Control key="create_organization" src="WebsitePanel/ExchangeServer/OrganizationCreateOrganization.ascx" title="OrganizationCreateOrganization" type="View" />
-			<Control key="organization_home" src="WebsitePanel/ExchangeServer/OrganizationHome.ascx" title="OrganizationHome" type="View" />
-			<Control key="organization_user_setup" src="WebsitePanel/ExchangeServer/OrganizationUserSetupInstructions.ascx" title="OrganizationUserSetupInstructions" type="View" />
-			<Control key="mailboxes" src="WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx" title="ExchangeMailboxes" type="View" />
-      <Control key="archivingmailboxes" src="WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx" title="ExchangeArchivingMailboxes" type="View" />
-      <Control key="create_mailbox" src="WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx" title="ExchangeCreateMailbox" type="View" />
-			<Control key="mailbox_settings" src="WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx" title="ExchangeMailboxGeneralSettings" type="View" />
-      <Control key="mailbox_mobile" src="WebsitePanel/ExchangeServer/ExchangeMailboxMobile.ascx" title="ExchangeMailboxMobile" type="View" />
-      <Control key="mailbox_mobile_details" src="WebsitePanel/ExchangeServer/ExchangeMailboxMobileDetails.ascx" title="ExchangeMailboxMobile" type="View" />
-			<Control key="mailbox_addresses" src="WebsitePanel/ExchangeServer/ExchangeMailboxEmailAddresses.ascx" title="ExchangeMailboxEmailAddresses" type="View" />
-			<Control key="mailbox_mailflow" src="WebsitePanel/ExchangeServer/ExchangeMailboxMailFlowSettings.ascx" title="ExchangeMailboxMailFlowSettings" type="View" />
-			<Control key="mailbox_permissions" src="WebsitePanel/ExchangeServer/ExchangeMailboxPermissions.ascx" title="ExchangeMailboxPermissions" type="View" />
-			<Control key="mailbox_advanced" src="WebsitePanel/ExchangeServer/ExchangeMailboxAdvancedSettings.ascx" title="ExchangeMailboxAdvancedSettings" type="View" />
-			<Control key="mailbox_setup" src="WebsitePanel/ExchangeServer/ExchangeMailboxSetupInstructions.ascx" title="ExchangeMailboxSetupInstructions" type="View" />
-			<Control key="contacts" src="WebsitePanel/ExchangeServer/ExchangeContacts.ascx" title="ExchangeContacts" type="View" />
-			<Control key="create_contact" src="WebsitePanel/ExchangeServer/ExchangeCreateContact.ascx" title="ExchangeCreateContact" type="View" />
-			<Control key="contact_settings" src="WebsitePanel/ExchangeServer/ExchangeContactGeneralSettings.ascx" title="ExchangeContactGeneralSettings" type="View" />
-			<Control key="contact_mailflow" src="WebsitePanel/ExchangeServer/ExchangeContactMailFlowSettings.ascx" title="ExchangeContactMailFlowSettings" type="View" />
-			<Control key="dlists" src="WebsitePanel/ExchangeServer/ExchangeDistributionLists.ascx" title="ExchangeDistributionLists" type="View" />
-			<Control key="create_dlist" src="WebsitePanel/ExchangeServer/ExchangeCreateDistributionList.ascx" title="ExchangeCreateDistributionList" type="View" />
-			<Control key="dlist_settings" src="WebsitePanel/ExchangeServer/ExchangeDistributionListGeneralSettings.ascx" title="ExchangeDistributionListGeneralSettings" type="View" />
-			<Control key="dlist_addresses" src="WebsitePanel/ExchangeServer/ExchangeDistributionListEmailAddresses.ascx" title="ExchangeDistributionListEmailAddresses" type="View" />
-			<Control key="dlist_mailflow" src="WebsitePanel/ExchangeServer/ExchangeDistributionListMailFlowSettings.ascx" title="ExchangeDistributionListMailFlowSettings" type="View" />
-			<Control key="dlist_permissions" src="WebsitePanel/ExchangeServer/ExchangeDistributionListPermissions.ascx" title="ExchangeDistributionListMailFlowSettings" type="View" />
-
-      <Control key="mailbox_memberof" src="WebsitePanel/ExchangeServer/ExchangeMailboxMemberOf.ascx" title="ExchangeMailboxMemberOf" type="View" />
-      <Control key="dlist_memberof" src="WebsitePanel/ExchangeServer/ExchangeDistributionListMemberOf.ascx" title="ExchangeDistributionListMemberOf" type="View" />
-      <Control key="user_memberof" src="WebsitePanel/ExchangeServer/OrganizationUserMemberOf.ascx" title="UserMemberOf" type="View" />
-
-      <Control key="disclaimers" src="WebsitePanel/ExchangeServer/ExchangeDisclaimers.ascx" title="ExchangeDisclaimers" type="View" />
-      <Control key="disclaimers_settings" src="WebsitePanel/ExchangeServer/ExchangeDisclaimerGeneralSettings.ascx" title="ExchangeDisclaimerGeneralSettings" type="View" />
-
-      <Control key="public_folders" src="WebsitePanel/ExchangeServer/ExchangePublicFolders.ascx" title="ExchangePublicFolders" type="View" />
-			<Control key="create_public_folder" src="WebsitePanel/ExchangeServer/ExchangeCreatePublicFolder.ascx" title="ExchangeCreatePublicFolder" type="View" />
-			<Control key="public_folder_settings" src="WebsitePanel/ExchangeServer/ExchangePublicFolderGeneralSettings.ascx" title="ExchangePublicFolderGeneralSettings" type="View" />
-			<Control key="public_folder_addresses" src="WebsitePanel/ExchangeServer/ExchangePublicFolderEmailAddresses.ascx" title="ExchangePublicFolderEmailAddresses" type="View" />
-			<Control key="public_folder_mailflow" src="WebsitePanel/ExchangeServer/ExchangePublicFolderMailFlowSettings.ascx" title="ExchangePublicFolderMailFlowSettings" type="View" />
-			<Control key="public_folder_mailenable" src="WebsitePanel/ExchangeServer/ExchangePublicFolderMailEnable.ascx" title="ExchangePublicFolderMailEnable" type="View" />
-			<Control key="domains" src="WebsitePanel/ExchangeServer/ExchangeDomainNames.ascx" title="ExchangeDomainNames" type="View" />
-      <Control key="org_domains" src="WebsitePanel/ExchangeServer/OrganizationDomainNames.ascx" title="OrganizationDomainNames" type="View" />
-      <Control key="org_add_domain" src="WebsitePanel/ExchangeServer/OrganizationAddDomainName.ascx" title="OrganizationAddDomainName" type="View" />
-      <Control key="add_domain" src="WebsitePanel/ExchangeServer/ExchangeAddDomainName.ascx" title="ExchangeAddDomainName" type="View" />
-			<Control key="domain_records" src="WebsitePanel/ExchangeServer/ExchangeDomainRecords.ascx" title="ExchangeDomainRecords" type="View" />
-			<Control key="storage_usage" src="WebsitePanel/ExchangeServer/ExchangeStorageUsage.ascx" title="ExchangeStorageUsage" type="View" />
-			<Control key="storage_usage_details" src="WebsitePanel/ExchangeServer/ExchangeStorageUsageBreakdown.ascx" title="ExchangeStorageUsageBreakdown" type="View" />
-			<Control key="storage_limits" src="WebsitePanel/ExchangeServer/ExchangeStorageLimits.ascx" title="ExchangeStorageLimits" type="View" />
-			<Control key="activesync_policy" src="WebsitePanel/ExchangeServer/ExchangeActiveSyncSettings.ascx" title="ExchangeActiveSyncSettings" type="View" />
-      <Control key="mailboxplans" src="WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx" title="ExchangeMailboxPlans" type="View" />
-      <Control key="retentionpolicy" src="WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx" title="ExchangeRetentionPolicy" type="View" />
-      <Control key="retentionpolicytag" src="WebsitePanel/ExchangeServer/ExchangeRetentionPolicyTag.ascx" title="ExchangeRetentionPolicyTag" type="View" />
-      <Control key="add_mailboxplan" src="WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx" title="ExchangeAddMailboxPlan" type="View" />
-
-      <Control key="CRMOrganizationDetails" src="WebsitePanel/CRM/CRMOrganizationDetails.ascx" title="ExchangeActiveSyncSettings" type="View" />
-			<Control key="CRMUsers" src="WebsitePanel/CRM/CRMUsers.ascx" title="CRM Users" type="View" />
-			<Control key="CRMUserRoles" src="WebsitePanel/CRM/CRMUserRoles.ascx" title="CRM User Roles" type="View" />
-			<Control key="create_crm_user" src="WebsitePanel/CRM/CreateCRMUser.ascx" title="Create CRM User" type="View" />
-      <Control key="crm_storage_settings" src="WebsitePanel/CRM/CRMStorageSettings.ascx" title="CRMRestoreSiteCollection" type="View"/>
-
-
-      <Control key="sharepoint_sitecollections" src="WebsitePanel/HostedSharePointSiteCollections.ascx" title="HostedSharePointSiteCollections" type="View"  icon="colors_48.png"/>
-			<Control key="sharepoint_edit_sitecollection" src="WebsitePanel/HostedSharePointEditSiteCollection.ascx" title="HostedSharePointSiteCollection" type="View" icon="colors_48.png" />
-			<Control key="sharepoint_backup_sitecollection" src="WebsitePanel/HostedSharePointBackupSiteCollection.ascx" title="HostedSharePointBackupSiteCollection" type="View"/>
-			<Control key="sharepoint_restore_sitecollection" src="WebsitePanel/HostedSharePointRestoreSiteCollection.ascx" title="HostedSharePointRestoreSiteCollection" type="View"/>
-			<Control key="sharepoint_storage_settings" src="WebsitePanel/HostedSharePointStorageSettings.ascx" title="HostedSharePointRestoreSiteCollection" type="View"/>
-			<Control key="sharepoint_storage_usage" src="WebsitePanel/HostedSharePointStorageUsage.ascx" title="HostedSharePointRestoreSiteCollection" type="View"/>
-
-
-			<Control key="blackberry_users" src="WebsitePanel/BlackBerry/BlackBerryUsers.ascx" title="BlackBerry Users" type="View" />
-			<Control key="create_new_blackberry_user" src="WebsitePanel/BlackBerry/CreateNewBlackBerryUser.ascx" title="Create New BlackBerry User" type="View" />
-			<Control key="edit_blackberry_user" src="WebsitePanel/BlackBerry/EditBlackBerryUser.ascx" title="Edit BlackBerry User" type="View" />
-
-			<Control key="ocs_users" src="WebsitePanel/OCS/OCSUsers.ascx" title="OCS Users" type="View" />
-			<Control key="create_new_ocs_user" src="WebsitePanel/OCS/CreateOCSUser.ascx" title="Create New OCS User" type="View" />
-			<Control key="edit_ocs_user" src="WebsitePanel/OCS/EditOCSUser.ascx" title="Edit OCS User" type="View" />
-
-      <Control key="lync_users" src="WebsitePanel/Lync/LyncUsers.ascx" title="Lync Users" type="View" />
-      <Control key="create_new_lync_user" src="WebsitePanel/Lync/LyncCreateUser.ascx" title="Create New Lync User" type="View" />
-      <Control key="lync_userplans" src="WebsitePanel/Lync/LyncUserPlans.ascx" title="LyncUserPlans" type="View" />
-      <Control key="lync_federationdomains" src="WebsitePanel/Lync/LyncFederationDomains.ascx" title="LyncFederationDomains" type="View" />
-      <Control key="add_lyncfederation_domain" src="WebsitePanel/Lync/LyncAddFederationDomain.ascx" title="LyncAddFederationDomain" type="View" />
-      <Control key="add_lyncuserplan" src="WebsitePanel/Lync/LyncAddLyncUserPlan.ascx" title="LyncAddLyncUserPlan" type="View" />
-      <Control key="edit_lync_user" src="WebsitePanel/Lync/LyncEditUser.ascx" title="Edit Lync User" type="View" />
-
-	    <Control key="secur_groups" src="WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx" title="OrganizationSecurityGroups" type="View" />
-      <Control key="create_secur_group" src="WebsitePanel/ExchangeServer/OrganizationCreateSecurityGroup.ascx" title="OrganizationSecurityGroup" type="View" />
-      <Control key="secur_group_settings" src="WebsitePanel/ExchangeServer/OrganizationSecurityGroupGeneralSettings.ascx" title="OrganizationSecurityGroup" type="View" />
-      <Control key="secur_group_memberof" src="WebsitePanel/ExchangeServer/OrganizationSecurityGroupMemberOf.ascx" title="OrganizationSecurityGroupMemberOf" type="View" />
-
-      <Control key="enterprisestorage_folders" src="WebsitePanel/ExchangeServer/EnterpriseStorageFolders.ascx" title="Enterprise Storage Folders" type="View" />
-      <Control key="create_enterprisestorage_folder" src="WebsitePanel/ExchangeServer/EnterpriseStorageCreateFolder.ascx" title="Create New ES Folder" type="View" />
-      <Control key="enterprisestorage_folder_settings" src="WebsitePanel/ExchangeServer/EnterpriseStorageFolderGeneralSettings.ascx" title="Edit ES Folder" type="View" />
-      <Control key="enterprisestorage_drive_maps" src="WebsitePanel/ExchangeServer/EnterpriseStorageDriveMaps.ascx" title="Enterprise Storage Drive Maps" type="View" />
-      <Control key="create_enterprisestorage_drive_map" src="WebsitePanel/ExchangeServer/EnterpriseStorageCreateDriveMap.ascx" title="Create New ES Drive Map" type="View" />
-
-      <Control key="lync_phonenumbers" src="WebsitePanel/Lync/LyncPhoneNumbers.ascx" title="LyncPhoneNumbers" type="View" />
-      <Control key="allocate_phonenumbers" src="WebsitePanel/Lync/LyncAllocatePhoneNumbers.ascx" title="LyncPhoneNumbers" type="View" />
-    
-      <Control key="rds_servers" src="WebsitePanel/RDS/AssignedRDSServers.ascx" title="RDSServers" type="View" />
-      <Control key="rds_add_server" src="WebsitePanel/RDS/AddRDSServer.ascx" title="AddRDSServer" type="View" />
-      <Control key="rds_collections" src="WebsitePanel/RDS/RDSCollections.ascx" title="RDSCollections" type="View" />
-      <Control key="rds_create_collection" src="WebsitePanel/RDS/RDSCreateCollection.ascx" title="RDSCreateCollection" type="View" />
-      <Control key="rds_collection_edit_apps" src="WebsitePanel/RDS/RDSEditCollectionApps.ascx" title="RDSEditCollectionApps" type="View" />
-      <Control key="rds_collection_edit_users" src="WebsitePanel/RDS/RDSEditCollectionUsers.ascx" title="RDSEditCollectionUsers" type="View" />
-    </Controls>
-	</ModuleDefinition>
-
-	<ModuleDefinition id="VPS">
-		<Controls>
-			<Control key="" src="WebsitePanel/VPS/VdcHome.ascx" title="VdcHome" type="View" />
-			<Control key="vdc_create_server" src="WebsitePanel/VPS/VdcCreateServer.ascx" title="VdcCreateServer" type="View" />
-      <Control key="vdc_import_server" src="WebsitePanel/VPS/VdcImportServer.ascx" title="VdcImportServer" type="View" />
-			<Control key="vdc_external_network" src="WebsitePanel/VPS/VdcExternalNetwork.ascx" title="VdcExternalNetwork" type="View" />
-			<Control key="vdc_management_network" src="WebsitePanel/VPS/VdcManagementNetwork.ascx" title="VdcManagementNetwork" type="View" />
-			<Control key="vdc_allocate_external_ip" src="WebsitePanel/VPS/VdcAddExternalAddress.ascx" title="VdcAddExternalAddress" type="View" />
-			<Control key="vdc_private_network" src="WebsitePanel/VPS/VdcPrivateNetwork.ascx" title="VdcPrivateNetwork" type="View" />
-			<Control key="vdc_permissions" src="WebsitePanel/VPS/VdcPermissions.ascx" title="VdcPermissions" type="View" />
-			<Control key="vdc_audit_log" src="WebsitePanel/VPS/VdcAuditLog.ascx" title="VdcAuditLog" type="View" />
-
-			<Control key="vps_general" src="WebsitePanel/VPS/VpsDetailsGeneral.ascx" title="VpsDetailsGeneral" type="View" />
-			<Control key="vps_config" src="WebsitePanel/VPS/VpsDetailsConfiguration.ascx" title="VpsDetailsConfiguration" type="View" />
-			<Control key="vps_edit_config" src="WebsitePanel/VPS/VpsDetailsEditConfiguration.ascx" title="VpsDetailsEditConfiguration" type="View" />
-			<Control key="vps_dvd" src="WebsitePanel/VPS/VpsDetailsDvd.ascx" title="VpsDetailsDvd" type="View" />
-			<Control key="vps_insert_dvd" src="WebsitePanel/VPS/VpsDetailsInsertDvd.ascx" title="VpsDetailsInsertDvd" type="View" />
-			<Control key="vps_snapshots" src="WebsitePanel/VPS/VpsDetailsSnapshots.ascx" title="VpsDetailsSnapshots" type="View" />
-			<Control key="vps_network" src="WebsitePanel/VPS/VpsDetailsNetwork.ascx" title="VpsDetailsNetwork" type="View" />
-			<Control key="vps_add_external_ip" src="WebsitePanel/VPS/VpsDetailsAddExternalAddress.ascx" title="VpsDetailsAddExternalAddress" type="View" />
-			<Control key="vps_add_private_ip" src="WebsitePanel/VPS/VpsDetailsAddPrivateAddress.ascx" title="VpsDetailsAddPrivateAddress" type="View" />
-			<Control key="vps_permissions" src="WebsitePanel/VPS/VpsDetailsPermissions.ascx" title="VpsDetailsNetworking" type="View" />
-			<Control key="vps_tools" src="WebsitePanel/VPS/VpsDetailsTools.ascx" title="VpsDetailsTools" type="View" />
-			<Control key="vps_audit_log" src="WebsitePanel/VPS/VpsDetailsAuditLog.ascx" title="VpsDetailsAuditLog" type="View" />
-			<Control key="vps_help" src="WebsitePanel/VPS/VpsDetailsHelp.ascx" title="VpsDetailsHelp" type="View" />
-			<Control key="vps_tools_delete" src="WebsitePanel/VPS/VpsToolsDeleteServer.ascx" title="VpsToolsDeleteServer" type="View" />
-      <Control key="vps_tools_move" src="WebsitePanel/VPS/VpsMoveServer.ascx" title="VpsMoveServer" type="View" />
-			<Control key="vps_tools_reinstall" src="WebsitePanel/VPS/VpsToolsReinstallServer.ascx" title="VpsToolsReinstallServer" type="View" />
-		</Controls>
-	</ModuleDefinition>
-
-  <ModuleDefinition id="VPSForPC">
-    <Controls>
-      <Control key="" src="WebsitePanel/VPSForPC/VdcHome.ascx" title="VdcHome" type="View" />
-      <Control key="vdc_create_server" src="WebsitePanel/VPSForPC/VdcCreateServer.ascx" title="VdcCreateServer" type="View" />
-      <Control key="vdc_import_server" src="WebsitePanel/VPSForPC/VdcImportServer.ascx" title="VdcImportServer" type="View" />
-      <Control key="vdc_FastCreate_server" src="WebsitePanel/VPSForPC/VdcFastCreateServer.ascx" title="VdcFastCreateServer" type="View" />
-      <Control key="vdc_external_network" src="WebsitePanel/VPSForPC/VdcExternalNetwork.ascx" title="VdcExternalNetwork" type="View" />
-      <Control key="vdc_management_network" src="WebsitePanel/VPSForPC/VdcManagementNetwork.ascx" title="VdcManagementNetwork" type="View" />
-      <Control key="vdc_allocate_external_ip" src="WebsitePanel/VPSForPC/VdcAddExternalAddress.ascx" title="VdcAddExternalAddress" type="View" />
-      <Control key="vdc_private_network" src="WebsitePanel/VPSForPC/VdcPrivateNetwork.ascx" title="VdcPrivateNetwork" type="View" />
-      <Control key="vdc_permissions" src="WebsitePanel/VPSForPC/VdcPermissions.ascx" title="VdcPermissions" type="View" />
-      <Control key="vdc_audit_log" src="WebsitePanel/VPSForPC/VdcAuditLog.ascx" title="VdcAuditLog" type="View" />
-      <Control key="vdc_account_vlan_network" src="WebsitePanel/VPSForPC/VdcAccountVLanNetwork.ascx" title="VdcAccountVLanNetwork" type="View" />
-      <Control key="vdc_account_vLan_add" src="WebsitePanel/VPSForPC/VdcAccountVLanAdd.ascx" title="VdcAccountVLanAdd" type="View" />
-      
-      <Control key="vps_general" src="WebsitePanel/VPSForPC/VpsDetailsGeneral.ascx" title="VpsDetailsGeneral" type="View" />
-      <Control key="vps_config" src="WebsitePanel/VPSForPC/VpsDetailsConfiguration.ascx" title="VpsDetailsConfiguration" type="View" />
-      <Control key="vps_edit_config" src="WebsitePanel/VPSForPC/VpsDetailsEditConfiguration.ascx" title="VpsDetailsEditConfiguration" type="View" />
-      <Control key="vps_dvd" src="WebsitePanel/VPSForPC/VpsDetailsDvd.ascx" title="VpsDetailsDvd" type="View" />
-      <Control key="vps_insert_dvd" src="WebsitePanel/VPSForPC/VpsDetailsInsertDvd.ascx" title="VpsDetailsInsertDvd" type="View" />
-      <Control key="vps_snapshots" src="WebsitePanel/VPSForPC/VpsDetailsSnapshots.ascx" title="VpsDetailsSnapshots" type="View" />
-      <Control key="vps_network" src="WebsitePanel/VPSForPC/VpsDetailsNetwork.ascx" title="VpsDetailsNetwork" type="View" />
-      <Control key="vps_add_external_ip" src="WebsitePanel/VPSForPC/VpsDetailsAddExternalAddress.ascx" title="VpsDetailsAddExternalAddress" type="View" />
-      <Control key="vps_add_private_ip" src="WebsitePanel/VPSForPC/VpsDetailsAddPrivateAddress.ascx" title="VpsDetailsAddPrivateAddress" type="View" />
-      <Control key="vps_permissions" src="WebsitePanel/VPSForPC/VpsDetailsPermissions.ascx" title="VpsDetailsNetworking" type="View" />
-      <Control key="vps_tools" src="WebsitePanel/VPSForPC/VpsDetailsTools.ascx" title="VpsDetailsTools" type="View" />
-      <Control key="vps_audit_log" src="WebsitePanel/VPSForPC/VpsDetailsAuditLog.ascx" title="VpsDetailsAuditLog" type="View" />
-      <Control key="vps_help" src="WebsitePanel/VPSForPC/VpsDetailsHelp.ascx" title="VpsDetailsHelp" type="View" />
-      <Control key="vps_tools_delete" src="WebsitePanel/VPSForPC/VpsToolsDeleteServer.ascx" title="VpsToolsDeleteServer" type="View" />
-      <Control key="vps_tools_move" src="WebsitePanel/VPSForPC/VpsMoveServer.ascx" title="VpsMoveServer" type="View" />
-      <Control key="vps_tools_reinstall" src="WebsitePanel/VPSForPC/VpsToolsReinstallServer.ascx" title="VpsToolsReinstallServer" type="View" />
-      <Control key="vps_events_log" src="WebsitePanel/VPSForPC/VpsEventsLog.ascx" title="VpsEventsLog" type="View" />
-      <Control key="vps_alerts_log" src="WebsitePanel/VPSForPC/VpsAlertsLog.ascx" title="VpsAlertsLog" type="View" />
-      <Control key="vps_monitoring" src="WebsitePanel/VPSForPC/VpsMonitoring.ascx" title="VpsMonitoring" type="View" />
-  	  <Control key="vps_checkpoints" src="WebsitePanel/VPSForPC/VpsCheckPoints.ascx" title="VpsCheckPoints" type="View" />
-
-	</Controls>
-  </ModuleDefinition>
-
-  <!-- CO Chnages-->
-  <ModuleDefinition id="ApplyEnableHardQuotaFeature">
-    <Controls>
-      <Control key="" src="WebsitePanel/ApplyEnableHardQuotaFeature.ascx" title="ApplyEnableHardQuotaFeature" type="View" icon="calendar_month_2_clock_48.png" />
-    </Controls>
-  </ModuleDefinition>
-  <!--END-->
-
-  <!-- Hosted Organization -->
-  <ModuleDefinition id="OrganizationMenu">
-    <Controls>
-      <Control key="" src="WebsitePanel/OrganizationMenu.ascx" title="OrganizationMenu" type="View" />
-    </Controls>
-  </ModuleDefinition>
-</ModuleDefinitions>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/WebsitePanel_Pages.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/WebsitePanel_Pages.config
deleted file mode 100644
index e10593c1..00000000
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/WebsitePanel_Pages.config
+++ /dev/null
@@ -1,774 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Pages>
-
-  <include file="ModulesData.config" />
-
-  <Page name="Login" roles="?" skin="Login.ascx" adminskin="Login.ascx" hidden="True">
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="Login" title="SignIn" container="Login.ascx" />
-    </Content>
-  </Page>
-
-  <Page name="LoggedUserDetails" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Edit.ascx">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="LoggedUserDetails" title="LoggedUserDetails" icon="user_write_48.png" container="Edit.ascx" />
-    </Content>
-  </Page>
-
-  <Page name="SearchUsers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Browse1.ascx">
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SearchUsers" title="SearchUsers" icon="user_zoom_48.png" container="Edit.ascx" />
-    </Content>
-  </Page>
-
-  <Page name="SearchSpaces" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Browse1.ascx">
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SearchSpaces" title="SearchSpaces" icon="sphere_zoom_48.png" container="Edit.ascx" />
-    </Content>
-  </Page>
-
-  <Page name="Home" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" skin="Browse3.ascx" align="right">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="UserCustomersSummary" title="UserCustomersSummary" container="Browse.ascx" icon="group_48.png"/>
-      <Module moduleDefinitionID="UserSpaces" title="UserSpaces" container="Browse.ascx" viewRoles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" icon="sphere_48.png">
-        <ModuleData ref="SpaceIcons"/>
-      </Module>
-      <Module moduleDefinitionID="UserNotes" title="UserNotes" container="Browse.ascx" viewRoles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" icon="notes_48.png" />
-    </Content>
-    <Content id="RightPane">
-      <Module moduleDefinitionID="UserDetails" title="UserDetails" container="Clear.ascx" />
-      <Module moduleDefinitionID="UserResellerSettings" title="UserResellerSettings" container="Clear.ascx" viewRoles="Administrator,Reseller" />
-    </Content>
-  </Page>
-
-  <!-- User Account Menu Pages -->
-  <Page name="UserCustomers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="UserCustomers" title="UserCustomers" icon="group_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="UserSpaces" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx" >
-        <ModuleData ref="UserMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="UserSpaces" title="UserSpaces" icon="sphere_48.png" readOnlyRoles="PlatformHelpdesk,ResellerHelpdesk" />
-    </Content>
-  </Page>
-
-  <Page name="UserPeers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="UserPeers" title="UserPeers" icon="motion_blur_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
-    </Content>
-  </Page>
-
-  <Page name="HostingPlans" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="HostingPlans" title="HostingPlans" icon="inventory_48.png"  readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
-    </Content>
-  </Page>
-
-  <Page name="HostingAddons" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="HostingAddons" title="HostingAddons" icon="inventory_add_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
-    </Content>
-  </Page>
-
-  <Page name="UserTasks" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="Tasks" title="Tasks" icon="hourglass_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
-    </Content>
-  </Page>
-
-  <Page name="AuditLog" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="AuditLog" title="AuditLog" icon="record_48.png" />
-    </Content>
-  </Page>
-
-  <!-- Space Home Page -->
-  <Page name="SpaceHome" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Browse3.ascx">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SpaceQuotas" title="SpaceQuotas" container="Browse.ascx" icon="stadistics_48.png" />
-      <Module moduleDefinitionID="SpaceNestedSpacesSummary" title="SpaceNestedSpacesSummary" container="Browse.ascx" viewRoles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" icon="sphere_down_48.png" />
-      <Module moduleDefinitionID="SpaceNotes" title="SpaceNotes" container="Browse.ascx" viewRoles="Administrator,Reseller" icon="notes_48.png" />
-    </Content>
-    <Content id="RightPane">
-      <Module moduleDefinitionID="SpaceDetails" title="SpaceDetails" container="Clear.ascx" />
-      <Module moduleDefinitionID="SpaceSettings" title="SpaceSettings" container="Clear.ascx" viewRoles="Administrator,Reseller"/>
-      <Module moduleDefinitionID="SpaceTools" title="SpaceTools" container="Clear.ascx" />
-    </Content>
-  </Page>
-
-  <!-- Nested Spaces Page -->
-  <Page name="NestedSpaces" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="NestedSpaces" title="NestedSpaces" icon="sphere_down_48.png" />
-    </Content>
-  </Page>
-
-
-  <Page name="SpaceOrganizationHostedSharePoint" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="HostedSolutionMenu" title="HostedSolutionMenu" container="Clear.ascx">
-        <ModuleData ref="HostedSolutionMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="HostedSharePointSiteCollections" title="HostedSharePointSiteCollections" icon="colors_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="SpaceDomains" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="Domains" title="Domains" icon="world_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
-    </Content>
-  </Page>
-
-  <Page name="SpaceWeb" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="WebSites" title="WebSites" icon="location_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="SpaceWebSites" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="WebSites" title="WebSites" icon="location_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-  <Page name="SpaceWebIPAddresses" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="WebSiteIPAddresses" title="WebSiteIPAddresses" icon="adress_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="LyncPhoneNumbers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="LyncPhoneNumbers" title="LyncPhoneNumbers" icon="adress_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="SpaceFtpAccounts" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="FtpAccounts" title="FtpAccounts" icon="folder_up_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="SpaceMail" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True"/>
-
-  <Page name="SpaceMailAccounts" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="MailAccounts" title="MailAccounts" icon="accounting_mail_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="SpaceMailForwardings" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="MailForwardings" title="MailForwardings" icon="safe-mail_next_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="SpaceMailGroups" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="MailGroups" title="MailGroups" icon="contacts_mail_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="SpaceMailLists" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="MailLists" title="MailLists" icon="discussion_group_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="SpaceMailDomains" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="MailDomains" title="MailDomains" icon="web_mail_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="SpaceDatabases" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True"/>
-
-  <Page name="SpaceMsSql2000" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SqlDatabases" title="Sql2000Databases" icon="mssql_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MsSQL2000" />
-        </Settings>
-      </Module>
-      <Module moduleDefinitionID="SqlUsers" title="Sql2000Users" icon="db_user_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MsSQL2000" />
-        </Settings>
-      </Module>
-    </Content>
-  </Page>
-
-  <Page name="SpaceMsSql2005" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SqlDatabases" title="Sql2005Databases" icon="mssql_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MsSQL2005" />
-        </Settings>
-      </Module>
-      <Module moduleDefinitionID="SqlUsers" title="Sql2005Users" icon="db_user_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MsSQL2005" />
-        </Settings>
-      </Module>
-    </Content>
-  </Page>
-
-  <Page name="SpaceMsSql2008" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SqlDatabases" title="Sql2008Databases" icon="mssql_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MsSQL2008" />
-        </Settings>
-      </Module>
-      <Module moduleDefinitionID="SqlUsers" title="Sql2008Users" icon="db_user_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MsSQL2008" />
-        </Settings>
-      </Module>
-    </Content>
-  </Page>
-
-  <Page name="SpaceMsSql2012" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SqlDatabases" title="Sql2012Databases" icon="mssql_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MsSQL2012" />
-        </Settings>
-      </Module>
-      <Module moduleDefinitionID="SqlUsers" title="Sql2012Users" icon="db_user_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MsSQL2012" />
-        </Settings>
-      </Module>
-    </Content>
-  </Page>
-
-    <Page name="SpaceMsSql2014" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-        <Content id="LeftPane">
-            <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-                <ModuleData ref="UserMenu"/>
-            </Module>
-            <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-                <ModuleData ref="SpaceMenu"/>
-            </Module>
-        </Content>
-        <Content id="ContentPane">
-            <Module moduleDefinitionID="SqlDatabases" title="Sql2014Databases" icon="mssql_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-                <Settings>
-                    <Add name="GroupName" value="MsSQL2014" />
-                </Settings>
-            </Module>
-            <Module moduleDefinitionID="SqlUsers" title="Sql2014Users" icon="db_user_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-                <Settings>
-                    <Add name="GroupName" value="MsSQL2014" />
-                </Settings>
-            </Module>
-        </Content>
-    </Page>
-
-  <Page name="SpaceMySql4" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SqlDatabases" title="MySql4Databases" icon="mysql_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MySQL4" />
-        </Settings>
-      </Module>
-      <Module moduleDefinitionID="SqlUsers" title="MySql4Users" icon="db_user_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MySQL4" />
-        </Settings>
-      </Module>
-    </Content>
-  </Page>
-
-  <Page name="SpaceMySql5" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SqlDatabases" title="MySql5Databases" icon="mysql_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MySQL5" />
-        </Settings>
-      </Module>
-      <Module moduleDefinitionID="SqlUsers" title="MySql5Users" icon="db_user_48.png" readOnlyRoles="PlatformCSR,ResellerCSR">
-        <Settings>
-          <Add name="GroupName" value="MySQL5" />
-        </Settings>
-      </Module>
-    </Content>
-  </Page>
-
-  <Page name="SpaceSharedSSL" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SharedSSL" title="SharedSSL" icon="world_lock_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-  <Page name="SpaceAdvancedStatistics" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="AdvancedStatistics" title="AdvancedStatistics" icon="stadistics_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-  <Page name="SpaceOdbc" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="ODBC" title="ODBC" icon="export_db_back_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-  <Page name="SpaceScheduledTasks" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="ScheduledTasks" title="ScheduledTasks" icon="calendar_month_2_clock_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-  <Page name="SpaceFileManager" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="FileManager" title="FileManager" icon="cabinet_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-  <Page name="SpaceWebApplicationsGallery" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="WebApplicationsGallery" title="WebApplicationsGallery" container="Browse.ascx" icon="dvd_disc_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-
-  <Page name="SpaceSharePoint" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True"/>
-
-  <Page name="SpaceSharePointSites" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="HostedSolutionMenu" title="HostedSolutionMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SharePointSites" title="SharePointSites" icon="colors_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-  <Page name="SpaceSharePointUsers" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="SharePointUsers" title="SharePointUsers" icon="user_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-      <Module moduleDefinitionID="SharePointGroups" title="SharePointGroups" icon="group_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-  <Page name="Backup" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <!-- Do not remove this stub page -->
-  </Page>
-
-  <Page name="SpaceExchangeServer" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Exchange.ascx" adminskin="Exchange.ascx">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-      <Module moduleDefinitionID="OrganizationMenu" title="OrganizationMenu" container="Clear.ascx">
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="ExchangeServer" title="ExchangeServer" icon="" container="Exchange.ascx" admincontainer="Exchange.ascx" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-  <Page name="SpaceVPS" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="VPS.ascx" adminskin="VPS.ascx">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="VPS" title="VirtualPrivateServers" icon="" container="VPS.ascx" admincontainer="VPS.ascx" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-  <Page name="SpaceVPSForPC" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="VPS.ascx" adminskin="VPS.ascx">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="VPSForPC" title="VirtualPrivateServersForPrivateCloud" icon="" container="VPSForPC.ascx" admincontainer="VPSForPC.ascx" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-
-
-  <Page name="OverusageReport" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk" hidden="True" skin="Browse1.ascx">
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="OverusageReport" title="OverusageReport" container="Edit.ascx" icon="table_zoom_48.png" />
-    </Content>
-  </Page>
-
-  <Page name="Reporting" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" enabled="false" align="left">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="User" title="User" container="Clear.ascx" />
-      <Module moduleDefinitionID="HostingSpace" title="HostingSpace" container="Clear.ascx" />
-    </Content>
-    <Pages>
-      <Page name="DiskspaceReport" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" skin="Browse1.ascx">
-        <Content id="LeftPane">
-          <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-            <ModuleData ref="UserMenu"/>
-          </Module>
-        </Content>
-        <Content id="ContentPane">
-          <Module moduleDefinitionID="DiskspaceReport" title="DiskspaceReport" container="Edit.ascx" icon="table_zoom_48.png" />
-        </Content>
-      </Page>
-      <Page name="BandwidthReport" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" skin="Browse1.ascx">
-        <Content id="LeftPane">
-          <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-            <ModuleData ref="UserMenu"/>
-          </Module>
-        </Content>
-        <Content id="ContentPane">
-          <Module moduleDefinitionID="BandwidthReport" title="BandwidthReport" container="Edit.ascx" icon="table_zoom_48.png" />
-        </Content>
-      </Page>
-    </Pages>
-  </Page>
-  <Page name="Configuration" roles="Administrator" enabled="false" align="left">
-    <Pages>
-      <Page name="VirtualServers" roles="Administrator" skin="Browse1.ascx">
-        <Content id="LeftPane">
-          <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-            <ModuleData ref="UserMenu"/>
-          </Module>
-        </Content>
-        <Content id="ContentPane">
-          <Module moduleDefinitionID="VirtualServers" title="VirtualServers" container="Edit.ascx" icon="network_48.png" />
-        </Content>
-      </Page>
-      <Page name="Servers" roles="Administrator" skin="Browse1.ascx">
-        <Content id="LeftPane">
-          <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-            <ModuleData ref="UserMenu"/>
-          </Module>
-        </Content>
-        <Content id="ContentPane">
-          <Module moduleDefinitionID="Servers" title="Servers" container="Edit.ascx" icon="computer_48.png" />
-        </Content>
-      </Page>
-      <Page name="RDSServers" roles="Administrator" skin="Browse1.ascx">
-        <Content id="LeftPane">
-          <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-            <ModuleData ref="UserMenu"/>
-          </Module>
-        </Content>
-        <Content id="ContentPane">
-          <Module moduleDefinitionID="RDSServers" title="RDSServers" icon="computer_48.png" container="Edit.ascx"/>
-        </Content>
-      </Page>
-      <Page name="IPAddresses" roles="Administrator" skin="Browse1.ascx">
-        <Content id="LeftPane">
-          <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-            <ModuleData ref="UserMenu"/>
-          </Module>
-        </Content>
-        <Content id="ContentPane">
-          <Module moduleDefinitionID="IPAddresses" title="IPAddresses" container="Edit.ascx" icon="adress_48.png" />
-        </Content>
-      </Page>
-      <Page name="PhoneNumbers" roles="Administrator" skin="Browse1.ascx">
-        <Content id="LeftPane">
-          <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-            <ModuleData ref="UserMenu"/>
-          </Module>
-        </Content>
-        <Content id="ContentPane">
-          <Module moduleDefinitionID="PhoneNumbers" title="PhoneNumbers" container="Edit.ascx" icon="adress_48.png" />
-        </Content>
-      </Page>
-      <Page name="SystemSettings" roles="Administrator" skin="Browse1.ascx">
-        <Content id="LeftPane">
-          <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-            <ModuleData ref="UserMenu"/>
-          </Module>
-        </Content>
-        <Content id="ContentPane">
-          <Module moduleDefinitionID="SystemSettings" title="SystemSettings" container="Edit.ascx" icon="tool_48.png" />
-        </Content>
-      </Page>
-    </Pages>
-  </Page>
-
-  <!-- CO Changes -->
-  <Page name="SpaceApplyEnableHardQuotaFeature" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
-    <Content id="LeftPane">
-      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
-        <ModuleData ref="UserMenu"/>
-      </Module>
-      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
-        <ModuleData ref="SpaceMenu"/>
-      </Module>
-    </Content>
-    <Content id="ContentPane">
-      <Module moduleDefinitionID="ApplyEnableHardQuotaFeature" title="ApplyEnableHardQuotaFeature" icon="cabinet_48.png" readOnlyRoles="PlatformCSR,ResellerCSR"/>
-    </Content>
-  </Page>
-  <!--END-->
-
-</Pages>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
index 72d02e2b..886aca09 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
@@ -42,6 +42,7 @@
     <webdavRoot value="https://webdav.websitepanel.net/" />
     <applicationName value="WebDAV Explorer" />
     <authTimeoutCookieName value=".auth-logout-timeout" />
+    <enterpriseServer url="http://localhost:9002" />
     <elementsRendering defaultCount="20" addElementsCount="20" />
     <websitePanelConstantUser login="serveradmin" password="HtR7J8dtBhovYLigXNtVutxqpvaE48Z+FBIokWZlR/g=" />
     <sessionKeys>
@@ -125,9 +126,6 @@
       <add name="ChartImg" path="ChartImg.axd" verb="GET,HEAD,POST" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" resourceType="Unspecified" preCondition="integratedMode" />
       <add name="FileHandler" path="*.*" verb="GET" type="WebsitePanel.WebDavPortal.HttpHandlers.FileTransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
     <remove name="ExtensionlessUrlHandler-Integrated-4.0" /><remove name="OPTIONSVerbHandler" /><remove name="TRACEVerbHandler" /><add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /></handlers>
-    <modules>
-      <add name="SecureSession" type="WebsitePanel.WebPortal.SecureSessionModule" />
-    </modules>
   <security>
         <requestFiltering allowDoubleEscaping="true" />
     </security>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
index 306c7c9b..9327be8f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
@@ -367,25 +367,6 @@
     <Content Include="fonts\glyphicons-halflings-regular.eot" />
     <Content Include="Content\bootstrap-theme.css.map" />
     <Content Include="Content\bootstrap.css.map" />
-    <Content Include="App_Data\SiteSettings.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="App_Data\Countries.config" />
-    <Content Include="App_Data\CountryStates.config" />
-    <Content Include="App_Data\Ecommerce_Modules.config" />
-    <Content Include="App_Data\Ecommerce_Pages.config" />
-    <Content Include="App_Data\ESModule_ControlsHierarchy.config" />
-    <Content Include="App_Data\ModulesData.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="App_Data\SupportedLocales.config" />
-    <Content Include="App_Data\SupportedThemes.config" />
-    <Content Include="App_Data\WebsitePanel_Modules.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="App_Data\WebsitePanel_Pages.config">
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="Content\DataTables-1.10.4\css\dataTables.responsive.scss" />
     <Content Include="Content\DataTables-1.10.4\css\dataTables.jqueryui.scss" />
     <None Include="Scripts\jquery-2.1.1.intellisense.js" />