diff --git a/src/sunstone/public/app/utils/vcenter-vm-folder.js b/src/sunstone/public/app/utils/vcenter-vm-folder.js
new file mode 100644
index 0000000000..317ff21306
--- /dev/null
+++ b/src/sunstone/public/app/utils/vcenter-vm-folder.js
@@ -0,0 +1,74 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                */
+/*                                                                            */
+/* Licensed under the Apache License, Version 2.0 (the "License"); you may    */
+/* not use this file except in compliance with the License. You may obtain    */
+/* a copy of the License at                                                   */
+/*                                                                            */
+/* http://www.apache.org/licenses/LICENSE-2.0                                 */
+/*                                                                            */
+/* Unless required by applicable law or agreed to in writing, software        */
+/* distributed under the License is distributed on an "AS IS" BASIS,          */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   */
+/* See the License for the specific language governing permissions and        */
+/* limitations under the License.                                             */
+/* -------------------------------------------------------------------------- */
+
+define(function(require){
+  var Locale = require('utils/locale');
+  var Config = require('sunstone-config');
+  var OpenNebula = require('opennebula');
+  var OpenNebulaImage = require('opennebula/image');
+  var UserInputs = require('utils/user-inputs');
+  var WizardFields = require('utils/wizard-fields');
+  var VcenterVMFolderTemplate = require('hbs!./vcenter-vm-folder/html');
+
+  return {
+    'setup': _setup,
+    'fill': _fill,
+    'retrieveChanges': _retrieveChanges
+  };
+
+  function _setup(context) {
+    if (!Config.isFeatureEnabled("vcenter_vm_folder")){
+      $(context).remove();
+    }
+  }
+
+  function _fill(context, element) {
+
+    if (Config.isFeatureEnabled("vcenter_vm_folder")){
+      var vcenterVMFolderContext = context;
+      var template_public_cloud_type = element.TEMPLATE.HYPERVISOR
+
+      if ($.isEmptyObject(template_public_cloud_type)) {
+        vcenterVMFolderContext.html("");
+      } else {
+        if (template_public_cloud_type === 'vcenter') {
+          var vcenter_vm_folder = element.TEMPLATE.VCENTER_VM_FOLDER
+          vcenterVMFolderContext.html(VcenterVMFolderTemplate());
+          $("#vcenter_vm_folder_input", vcenterVMFolderContext).val(vcenter_vm_folder);
+          $("#vcenter_vm_folder_input", vcenterVMFolderContext).data("original_value",vcenter_vm_folder);
+        } else {
+          vcenterVMFolderContext.html("");
+        }
+      }
+    }
+  }
+
+
+  function _retrieveChanges(context) {
+
+    var templateJSON = WizardFields.retrieve(context);
+    var fields = $('[wizard_field]', context);
+
+    fields.each(function() {
+      var field_name = $(this).attr('wizard_field');
+      if (templateJSON[field_name] == $(this).data("original_value")){
+          delete templateJSON[field_name];
+      }
+    });
+
+    return templateJSON;
+  }
+});
\ No newline at end of file
diff --git a/src/sunstone/public/app/utils/vcenter-vm-folder/html.hbs b/src/sunstone/public/app/utils/vcenter-vm-folder/html.hbs
new file mode 100644
index 0000000000..834488b52f
--- /dev/null
+++ b/src/sunstone/public/app/utils/vcenter-vm-folder/html.hbs
@@ -0,0 +1,29 @@
+{{! -------------------------------------------------------------------------- }}
+{{! Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                }}
+{{!                                                                            }}
+{{! Licensed under the Apache License, Version 2.0 (the "License"); you may    }}
+{{! not use this file except in compliance with the License. You may obtain    }}
+{{! a copy of the License at                                                   }}
+{{!                                                                            }}
+{{! http://www.apache.org/licenses/LICENSE-2.0                                 }}
+{{!                                                                            }}
+{{! Unless required by applicable law or agreed to in writing, software        }}
+{{! distributed under the License is distributed on an "AS IS" BASIS,          }}
+{{! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   }}
+{{! See the License for the specific language governing permissions and        }}
+{{! limitations under the License.                                             }}
+{{! -------------------------------------------------------------------------- }}
+
+<fieldset>
+  <legend>
+    <i class="fa fa-folder"></i> {{tr "vCenter Deployment"}}
+  </legend>
+  <div class="deployContainer">
+    <label for="vcenter_vm_folder_input">
+        {{tr "vCenter VM Folder"}}
+        {{{tip (tr "If specified, the VMs and Template folder path where the VM will be created inside the data center. The path is delimited by slashes e.g /Management/VMs. If no path is set the VM will be placed in the same folder where the template is located.")}}}
+    </label>
+    <input type="text" name="vcenter_vm_folder_input" id="vcenter_vm_folder_input" wizard_field="VCENTER_VM_FOLDER"/>
+  </div>
+</fieldset>
+