diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs
index 04c3d31b..f441a76a 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.6400
+//     Runtime Version:2.0.50727.6407
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -11,6 +11,11 @@
 // 
 // This source code was auto-generated by wsdl, Version=2.0.50727.3038.
 // 
+using WebsitePanel.Providers;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.OS;
+
 namespace WebsitePanel.EnterpriseServer {
     using System.Xml.Serialization;
     using System.Web.Services;
@@ -21,16 +26,399 @@ namespace WebsitePanel.EnterpriseServer {
     
     
     /// <remarks/>
-    // CODEGEN: No methods were found in the WSDL for this protocol.
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Web.Services.WebServiceBindingAttribute(Name="esEnterpriseStorageSoap", Namespace="http://smbsaas/websitepanel/enterpriseserver")]
+    [System.Xml.Serialization.XmlIncludeAttribute(typeof(ServiceProviderItem))]
     public partial class esEnterpriseStorage : Microsoft.Web.Services3.WebServicesClientProtocol {
         
+        private System.Threading.SendOrPostCallback GetEnterpriseFoldersOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetEnterpriseFolderOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CreateEnterpriseFolderOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteEnterpriseFolderOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetEnterpriseFolderQuotaOperationCompleted;
+        
         /// <remarks/>
         public esEnterpriseStorage() {
             this.Url = "http://localhost:9002/esEnterpriseStorage.asmx";
         }
+        
+        /// <remarks/>
+        public event GetEnterpriseFoldersCompletedEventHandler GetEnterpriseFoldersCompleted;
+        
+        /// <remarks/>
+        public event GetEnterpriseFolderCompletedEventHandler GetEnterpriseFolderCompleted;
+        
+        /// <remarks/>
+        public event CreateEnterpriseFolderCompletedEventHandler CreateEnterpriseFolderCompleted;
+        
+        /// <remarks/>
+        public event DeleteEnterpriseFolderCompletedEventHandler DeleteEnterpriseFolderCompleted;
+        
+        /// <remarks/>
+        public event SetEnterpriseFolderQuotaCompletedEventHandler SetEnterpriseFolderQuotaCompleted;
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetEnterpriseFolders", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public SystemFile[] GetEnterpriseFolders(int itemId) {
+            object[] results = this.Invoke("GetEnterpriseFolders", new object[] {
+                        itemId});
+            return ((SystemFile[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetEnterpriseFolders(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetEnterpriseFolders", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SystemFile[] EndGetEnterpriseFolders(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SystemFile[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetEnterpriseFoldersAsync(int itemId) {
+            this.GetEnterpriseFoldersAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetEnterpriseFoldersAsync(int itemId, object userState) {
+            if ((this.GetEnterpriseFoldersOperationCompleted == null)) {
+                this.GetEnterpriseFoldersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetEnterpriseFoldersOperationCompleted);
+            }
+            this.InvokeAsync("GetEnterpriseFolders", new object[] {
+                        itemId}, this.GetEnterpriseFoldersOperationCompleted, userState);
+        }
+        
+        private void OnGetEnterpriseFoldersOperationCompleted(object arg) {
+            if ((this.GetEnterpriseFoldersCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetEnterpriseFoldersCompleted(this, new GetEnterpriseFoldersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetEnterpriseFolder", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public SystemFile GetEnterpriseFolder(int itemId, string folderName) {
+            object[] results = this.Invoke("GetEnterpriseFolder", new object[] {
+                        itemId,
+                        folderName});
+            return ((SystemFile)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetEnterpriseFolder(int itemId, string folderName, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetEnterpriseFolder", new object[] {
+                        itemId,
+                        folderName}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SystemFile EndGetEnterpriseFolder(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SystemFile)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetEnterpriseFolderAsync(int itemId, string folderName) {
+            this.GetEnterpriseFolderAsync(itemId, folderName, null);
+        }
+        
+        /// <remarks/>
+        public void GetEnterpriseFolderAsync(int itemId, string folderName, object userState) {
+            if ((this.GetEnterpriseFolderOperationCompleted == null)) {
+                this.GetEnterpriseFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetEnterpriseFolderOperationCompleted);
+            }
+            this.InvokeAsync("GetEnterpriseFolder", new object[] {
+                        itemId,
+                        folderName}, this.GetEnterpriseFolderOperationCompleted, userState);
+        }
+        
+        private void OnGetEnterpriseFolderOperationCompleted(object arg) {
+            if ((this.GetEnterpriseFolderCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetEnterpriseFolderCompleted(this, new GetEnterpriseFolderCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreateEnterpriseFolder", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ResultObject CreateEnterpriseFolder(int itemId, string folderName, long quota) {
+            object[] results = this.Invoke("CreateEnterpriseFolder", new object[] {
+                        itemId,
+                        folderName,
+                        quota});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginCreateEnterpriseFolder(int itemId, string folderName, long quota, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("CreateEnterpriseFolder", new object[] {
+                        itemId,
+                        folderName,
+                        quota}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndCreateEnterpriseFolder(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void CreateEnterpriseFolderAsync(int itemId, string folderName, long quota) {
+            this.CreateEnterpriseFolderAsync(itemId, folderName, quota, null);
+        }
+        
+        /// <remarks/>
+        public void CreateEnterpriseFolderAsync(int itemId, string folderName, long quota, object userState) {
+            if ((this.CreateEnterpriseFolderOperationCompleted == null)) {
+                this.CreateEnterpriseFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateEnterpriseFolderOperationCompleted);
+            }
+            this.InvokeAsync("CreateEnterpriseFolder", new object[] {
+                        itemId,
+                        folderName,
+                        quota}, this.CreateEnterpriseFolderOperationCompleted, userState);
+        }
+        
+        private void OnCreateEnterpriseFolderOperationCompleted(object arg) {
+            if ((this.CreateEnterpriseFolderCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CreateEnterpriseFolderCompleted(this, new CreateEnterpriseFolderCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteEnterpriseFolder", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ResultObject DeleteEnterpriseFolder(int itemId, string folderName) {
+            object[] results = this.Invoke("DeleteEnterpriseFolder", new object[] {
+                        itemId,
+                        folderName});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginDeleteEnterpriseFolder(int itemId, string folderName, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("DeleteEnterpriseFolder", new object[] {
+                        itemId,
+                        folderName}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndDeleteEnterpriseFolder(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void DeleteEnterpriseFolderAsync(int itemId, string folderName) {
+            this.DeleteEnterpriseFolderAsync(itemId, folderName, null);
+        }
+        
+        /// <remarks/>
+        public void DeleteEnterpriseFolderAsync(int itemId, string folderName, object userState) {
+            if ((this.DeleteEnterpriseFolderOperationCompleted == null)) {
+                this.DeleteEnterpriseFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteEnterpriseFolderOperationCompleted);
+            }
+            this.InvokeAsync("DeleteEnterpriseFolder", new object[] {
+                        itemId,
+                        folderName}, this.DeleteEnterpriseFolderOperationCompleted, userState);
+        }
+        
+        private void OnDeleteEnterpriseFolderOperationCompleted(object arg) {
+            if ((this.DeleteEnterpriseFolderCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.DeleteEnterpriseFolderCompleted(this, new DeleteEnterpriseFolderCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetEnterpriseFolderQuota", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ResultObject SetEnterpriseFolderQuota(int itemId, string folderName, long quota) {
+            object[] results = this.Invoke("SetEnterpriseFolderQuota", new object[] {
+                        itemId,
+                        folderName,
+                        quota});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSetEnterpriseFolderQuota(int itemId, string folderName, long quota, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SetEnterpriseFolderQuota", new object[] {
+                        itemId,
+                        folderName,
+                        quota}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndSetEnterpriseFolderQuota(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void SetEnterpriseFolderQuotaAsync(int itemId, string folderName, long quota) {
+            this.SetEnterpriseFolderQuotaAsync(itemId, folderName, quota, null);
+        }
+        
+        /// <remarks/>
+        public void SetEnterpriseFolderQuotaAsync(int itemId, string folderName, long quota, object userState) {
+            if ((this.SetEnterpriseFolderQuotaOperationCompleted == null)) {
+                this.SetEnterpriseFolderQuotaOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetEnterpriseFolderQuotaOperationCompleted);
+            }
+            this.InvokeAsync("SetEnterpriseFolderQuota", new object[] {
+                        itemId,
+                        folderName,
+                        quota}, this.SetEnterpriseFolderQuotaOperationCompleted, userState);
+        }
+        
+        private void OnSetEnterpriseFolderQuotaOperationCompleted(object arg) {
+            if ((this.SetEnterpriseFolderQuotaCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetEnterpriseFolderQuotaCompleted(this, new SetEnterpriseFolderQuotaCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        public new void CancelAsync(object userState) {
+            base.CancelAsync(userState);
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetEnterpriseFoldersCompletedEventHandler(object sender, GetEnterpriseFoldersCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetEnterpriseFoldersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetEnterpriseFoldersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SystemFile[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SystemFile[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetEnterpriseFolderCompletedEventHandler(object sender, GetEnterpriseFolderCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetEnterpriseFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetEnterpriseFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SystemFile Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SystemFile)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void CreateEnterpriseFolderCompletedEventHandler(object sender, CreateEnterpriseFolderCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CreateEnterpriseFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal CreateEnterpriseFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void DeleteEnterpriseFolderCompletedEventHandler(object sender, DeleteEnterpriseFolderCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class DeleteEnterpriseFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal DeleteEnterpriseFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void SetEnterpriseFolderQuotaCompletedEventHandler(object sender, SetEnterpriseFolderQuotaCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SetEnterpriseFolderQuotaCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal SetEnterpriseFolderQuotaCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj
index caf29edc..3fead25f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj
@@ -105,6 +105,7 @@
     <Compile Include="Ecommerce\TaskEventHandlers\SystemTriggersAgent.cs" />
     <Compile Include="Ecommerce\TriggerSystem\CommonTrigger.cs" />
     <Compile Include="Ecommerce\TriggerSystem\TriggerController.cs" />
+    <Compile Include="EnterpriseStorage\EnterpriseStorageController.cs" />
     <Compile Include="ExchangeServer\ExchangeServerController.cs" />
     <Compile Include="Files\FilesController.cs" />
     <Compile Include="FtpServers\FtpServerController.cs" />
@@ -187,6 +188,7 @@
       <Name>WebsitePanel.Whois</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
index 787495f0..ca86b949 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
@@ -37,27 +37,52 @@ using System.ComponentModel;
 
 using Microsoft.Web.Services3;
 
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.HostedSolution;
 using WebsitePanel.Providers.EnterpriseStorage;
+using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.OS;
 
 namespace WebsitePanel.EnterpriseServer
 {
     /// <summary>
-    /// Summary description for esApplicationsInstaller
+    /// Summary description for esEnterpriseStorage
     /// </summary>
     [WebService(Namespace = "http://smbsaas/websitepanel/enterpriseserver")]
     [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
     [Policy("ServerPolicy")]
     [ToolboxItem(false)]
-    public class esEnterpriseStorage : System.Web.Services.WebService
+    public class esEnterpriseStorage : WebService
     {
-        /*
         [WebMethod]
-        public DataSet GetRawOdbcSourcesPaged(int packageId,
-            string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        public SystemFile[] GetEnterpriseFolders(int itemId)
         {
-            return OperatingSystemController.GetRawOdbcSourcesPaged(packageId, filterColumn,
-                filterValue, sortColumn, startRow, maximumRows);
+            return EnterpriseStorageController.GetFolders(itemId);
+        }
+
+        [WebMethod]
+        public SystemFile GetEnterpriseFolder(int itemId, string folderName)
+        {
+            return EnterpriseStorageController.GetFolder(itemId, folderName);
+        }
+
+        [WebMethod]
+        public ResultObject CreateEnterpriseFolder(int itemId, string folderName, long quota)
+        {
+            return EnterpriseStorageController.CreateFolder(itemId, folderName, quota);
+        }
+       
+
+        [WebMethod]
+        public ResultObject DeleteEnterpriseFolder(int itemId, string folderName)
+        {
+            return EnterpriseStorageController.DeleteFolder(itemId, folderName);
+        }
+
+        [WebMethod]
+        public ResultObject SetEnterpriseFolderQuota(int itemId, string folderName, long quota)
+        {
+            return EnterpriseStorageController.SetFolderQuota(itemId, folderName, quota);
         }
-        */
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs b/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs
index 7d36a829..001239af 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs
@@ -1,35 +1,7 @@
-// Copyright (c) 2012, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.6400
+//     Runtime Version:2.0.50727.6407
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -39,7 +11,11 @@
 // 
 // This source code was auto-generated by wsdl, Version=2.0.50727.3038.
 // 
-using WebsitePanel.Providers.HostedSolution;
+
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.OS;
+
 
 namespace WebsitePanel.Providers.EnterpriseStorage {
     using System.Xml.Serialization;
@@ -51,16 +27,331 @@ namespace WebsitePanel.Providers.EnterpriseStorage {
     
     
     /// <remarks/>
-    // CODEGEN: No methods were found in the WSDL for this protocol.
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Web.Services.WebServiceBindingAttribute(Name="EnterpriseStorageSoap", Namespace="http://smbsaas/websitepanel/server/")]
+    [System.Xml.Serialization.XmlIncludeAttribute(typeof(ServiceProviderItem))]
     public partial class EnterpriseStorage : Microsoft.Web.Services3.WebServicesClientProtocol {
         
+        public ServiceProviderSettingsSoapHeader ServiceProviderSettingsSoapHeaderValue;
+        
+        private System.Threading.SendOrPostCallback GetFoldersOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetFolderOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CreateFolderOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteFolderOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetFolderQuotaOperationCompleted;
+        
         /// <remarks/>
         public EnterpriseStorage() {
             this.Url = "http://localhost:9003/EnterpriseStorage.asmx";
         }
+        
+        /// <remarks/>
+        public event GetFoldersCompletedEventHandler GetFoldersCompleted;
+        
+        /// <remarks/>
+        public event GetFolderCompletedEventHandler GetFolderCompleted;
+        
+        /// <remarks/>
+        public event CreateFolderCompletedEventHandler CreateFolderCompleted;
+        
+        /// <remarks/>
+        public event DeleteFolderCompletedEventHandler DeleteFolderCompleted;
+        
+        /// <remarks/>
+        public event SetFolderQuotaCompletedEventHandler SetFolderQuotaCompleted;
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/GetFolders", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public SystemFile[] GetFolders(string organizationId) {
+            object[] results = this.Invoke("GetFolders", new object[] {
+                        organizationId});
+            return ((SystemFile[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetFolders(string organizationId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetFolders", new object[] {
+                        organizationId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SystemFile[] EndGetFolders(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SystemFile[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetFoldersAsync(string organizationId) {
+            this.GetFoldersAsync(organizationId, null);
+        }
+        
+        /// <remarks/>
+        public void GetFoldersAsync(string organizationId, object userState) {
+            if ((this.GetFoldersOperationCompleted == null)) {
+                this.GetFoldersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFoldersOperationCompleted);
+            }
+            this.InvokeAsync("GetFolders", new object[] {
+                        organizationId}, this.GetFoldersOperationCompleted, userState);
+        }
+        
+        private void OnGetFoldersOperationCompleted(object arg) {
+            if ((this.GetFoldersCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetFoldersCompleted(this, new GetFoldersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/GetFolder", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public SystemFile GetFolder(string organizationId, string folder) {
+            object[] results = this.Invoke("GetFolder", new object[] {
+                        organizationId,
+                        folder});
+            return ((SystemFile)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetFolder(string organizationId, string folder, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetFolder", new object[] {
+                        organizationId,
+                        folder}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SystemFile EndGetFolder(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SystemFile)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetFolderAsync(string organizationId, string folder) {
+            this.GetFolderAsync(organizationId, folder, null);
+        }
+        
+        /// <remarks/>
+        public void GetFolderAsync(string organizationId, string folder, object userState) {
+            if ((this.GetFolderOperationCompleted == null)) {
+                this.GetFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFolderOperationCompleted);
+            }
+            this.InvokeAsync("GetFolder", new object[] {
+                        organizationId,
+                        folder}, this.GetFolderOperationCompleted, userState);
+        }
+        
+        private void OnGetFolderOperationCompleted(object arg) {
+            if ((this.GetFolderCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetFolderCompleted(this, new GetFolderCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/CreateFolder", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void CreateFolder(string organizationId, string folder) {
+            this.Invoke("CreateFolder", new object[] {
+                        organizationId,
+                        folder});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginCreateFolder(string organizationId, string folder, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("CreateFolder", new object[] {
+                        organizationId,
+                        folder}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndCreateFolder(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void CreateFolderAsync(string organizationId, string folder) {
+            this.CreateFolderAsync(organizationId, folder, null);
+        }
+        
+        /// <remarks/>
+        public void CreateFolderAsync(string organizationId, string folder, object userState) {
+            if ((this.CreateFolderOperationCompleted == null)) {
+                this.CreateFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateFolderOperationCompleted);
+            }
+            this.InvokeAsync("CreateFolder", new object[] {
+                        organizationId,
+                        folder}, this.CreateFolderOperationCompleted, userState);
+        }
+        
+        private void OnCreateFolderOperationCompleted(object arg) {
+            if ((this.CreateFolderCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CreateFolderCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/DeleteFolder", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void DeleteFolder(string organizationId, string folder) {
+            this.Invoke("DeleteFolder", new object[] {
+                        organizationId,
+                        folder});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginDeleteFolder(string organizationId, string folder, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("DeleteFolder", new object[] {
+                        organizationId,
+                        folder}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndDeleteFolder(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void DeleteFolderAsync(string organizationId, string folder) {
+            this.DeleteFolderAsync(organizationId, folder, null);
+        }
+        
+        /// <remarks/>
+        public void DeleteFolderAsync(string organizationId, string folder, object userState) {
+            if ((this.DeleteFolderOperationCompleted == null)) {
+                this.DeleteFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteFolderOperationCompleted);
+            }
+            this.InvokeAsync("DeleteFolder", new object[] {
+                        organizationId,
+                        folder}, this.DeleteFolderOperationCompleted, userState);
+        }
+        
+        private void OnDeleteFolderOperationCompleted(object arg) {
+            if ((this.DeleteFolderCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.DeleteFolderCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/SetFolderQuota", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void SetFolderQuota(string organizationId, string folder, long quota) {
+            this.Invoke("SetFolderQuota", new object[] {
+                        organizationId,
+                        folder,
+                        quota});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSetFolderQuota(string organizationId, string folder, long quota, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SetFolderQuota", new object[] {
+                        organizationId,
+                        folder,
+                        quota}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndSetFolderQuota(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void SetFolderQuotaAsync(string organizationId, string folder, long quota) {
+            this.SetFolderQuotaAsync(organizationId, folder, quota, null);
+        }
+        
+        /// <remarks/>
+        public void SetFolderQuotaAsync(string organizationId, string folder, long quota, object userState) {
+            if ((this.SetFolderQuotaOperationCompleted == null)) {
+                this.SetFolderQuotaOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetFolderQuotaOperationCompleted);
+            }
+            this.InvokeAsync("SetFolderQuota", new object[] {
+                        organizationId,
+                        folder,
+                        quota}, this.SetFolderQuotaOperationCompleted, userState);
+        }
+        
+        private void OnSetFolderQuotaOperationCompleted(object arg) {
+            if ((this.SetFolderQuotaCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetFolderQuotaCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        public new void CancelAsync(object userState) {
+            base.CancelAsync(userState);
+        }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetFoldersCompletedEventHandler(object sender, GetFoldersCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetFoldersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetFoldersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SystemFile[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SystemFile[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetFolderCompletedEventHandler(object sender, GetFolderCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SystemFile Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SystemFile)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void CreateFolderCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void DeleteFolderCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void SetFolderQuotaCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
 }