diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index a32ed4a8c..8e8420cb4 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<idea-plugin>
+<idea-plugin require-restart="true">
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
     <version>3.2.0</version>
@@ -66,6 +66,7 @@
             <action id="MagentoCreateAViewModel" class="com.magento.idea.magento2plugin.actions.generation.NewViewModelAction" />
             <action id="MagentoCreateAGraphQlResolver" class="com.magento.idea.magento2plugin.actions.generation.NewGraphQlResolverAction" />
             <action id="MagentoCreateCLICommand" class="com.magento.idea.magento2plugin.actions.generation.NewCLICommandAction" />
+            <action id="MagentoCreateEmailTemplate" class="com.magento.idea.magento2plugin.actions.generation.NewEmailTemplateAction" />
             <action id="MagentoCreateUiComponentGrid" class="com.magento.idea.magento2plugin.actions.generation.NewUiComponentGridAction" />
             <action id="MagentoCreateUiComponentForm" class="com.magento.idea.magento2plugin.actions.generation.NewUiComponentFormAction" />
             <action id="NewModelsAction" class="com.magento.idea.magento2plugin.actions.generation.NewModelsAction" />
diff --git a/resources/fileTemplates/code/Magento Module Email Template Xml.xml.ft b/resources/fileTemplates/code/Magento Module Email Template Xml.xml.ft
new file mode 100644
index 000000000..359f7d77a
--- /dev/null
+++ b/resources/fileTemplates/code/Magento Module Email Template Xml.xml.ft	
@@ -0,0 +1 @@
+<template id="${ID}" label="${LABEL}" file="${FILE_NAME}.html" type="${TYPE}" module="${MODULE}" area="${AREA}"/>
\ No newline at end of file
diff --git a/resources/fileTemplates/code/Magento Module Email Template Xml.xml.html b/resources/fileTemplates/code/Magento Module Email Template Xml.xml.html
new file mode 100644
index 000000000..66462e777
--- /dev/null
+++ b/resources/fileTemplates/code/Magento Module Email Template Xml.xml.html	
@@ -0,0 +1,52 @@
+<!--
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<html>
+<body>
+<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
+    <tr>
+        <td>
+            <font face="verdana" size="-1">Email templates configuration.</font>
+        </td>
+    </tr>
+</table>
+<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
+    <tr>
+        <td colspan="3"><font face="verdana" size="-1">Predefined variables explanation:</font></td>
+    </tr>
+    <tr>
+        <td valign="top"><nobr><font face="verdana" size="-2"><b>${ID}</b></font></nobr></td>
+        <td width="10">&nbsp;</td>
+        <td width="100%" valign="top"><font face="verdana" size="-1">Email template ID.</font></td>
+    </tr>
+    <tr>
+        <td valign="top"><nobr><font face="verdana" size="-2"><b>${LABEL}</b></font></nobr></td>
+        <td width="10">&nbsp;</td>
+        <td width="100%" valign="top"><font face="verdana" size="-1">Email Template Label.</font></td>
+    </tr>
+    <tr>
+        <td valign="top"><nobr><font face="verdana" size="-2"><b>${FILE_NAME}</b></font></nobr></td>
+        <td width="10">&nbsp;</td>
+        <td width="100%" valign="top"><font face="verdana" size="-1">Email template file name.</font></td>
+    </tr>
+    <tr>
+        <td valign="top"><nobr><font face="verdana" size="-2"><b>${TYPE}</b></font></nobr></td>
+        <td width="10">&nbsp;</td>
+        <td width="100%" valign="top"><font face="verdana" size="-1">Email template type. (HTML or TEXT)</font></td>
+    </tr>
+    <tr>
+        <td valign="top"><nobr><font face="verdana" size="-2"><b>${MODULE}</b></font></nobr></td>
+        <td width="10">&nbsp;</td>
+        <td width="100%" valign="top"><font face="verdana" size="-1">Module's name.</font></td>
+    </tr>
+    <tr>
+        <td valign="top"><nobr><font face="verdana" size="-2"><b>${AREA}</b></font></nobr></td>
+        <td width="10">&nbsp;</td>
+        <td width="100%" valign="top"><font face="verdana" size="-1">Email template area. (Adminhtml or Frontend)</font></td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/fileTemplates/internal/Magento Module Email Template Html.html.ft b/resources/fileTemplates/internal/Magento Module Email Template Html.html.ft
new file mode 100644
index 000000000..60ee91ef3
--- /dev/null
+++ b/resources/fileTemplates/internal/Magento Module Email Template Html.html.ft	
@@ -0,0 +1,7 @@
+<!--@subject {{trans "${SUBJECT}"}} @-->
+<!--@vars {} @-->
+
+#if (${HTML_TYPE}){{template config_path="design/email/header_template"}}#end
+
+<!-- @todo: implement ${TYPE} template -->
+#if (${HTML_TYPE}){{template config_path="design/email/footer_template"}}#end
diff --git a/resources/fileTemplates/internal/Magento Module Email Template Html.html.html b/resources/fileTemplates/internal/Magento Module Email Template Html.html.html
new file mode 100644
index 000000000..88051f483
--- /dev/null
+++ b/resources/fileTemplates/internal/Magento Module Email Template Html.html.html	
@@ -0,0 +1,37 @@
+<!--
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<html>
+<body>
+<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
+    <tr>
+        <td>
+            <font face="verdana" size="-1">Email template.</font>
+        </td>
+    </tr>
+</table>
+<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
+    <tr>
+        <td colspan="3"><font face="verdana" size="-1">Predefined variables explanation:</font></td>
+    </tr>
+    <tr>
+        <td valign="top"><nobr><font face="verdana" size="-2"><b>${SUBJECT}</b></font></nobr></td>
+        <td width="10">&nbsp;</td>
+        <td width="100%" valign="top"><font face="verdana" size="-1">Email subject.</font></td>
+    </tr>
+    <tr>
+        <td valign="top"><nobr><font face="verdana" size="-2"><b>${HTML_TYPE}</b></font></nobr></td>
+        <td width="10">&nbsp;</td>
+        <td width="100%" valign="top"><font face="verdana" size="-1">Defines if it's HTML type template.</font></td>
+    </tr>
+    <tr>
+        <td valign="top"><nobr><font face="verdana" size="-2"><b>${TYPE}</b></font></nobr></td>
+        <td width="10">&nbsp;</td>
+        <td width="100%" valign="top"><font face="verdana" size="-1">Email template type. (HTML or TEXT)</font></td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/fileTemplates/internal/Magento Module Email Templates Xml.xml.ft b/resources/fileTemplates/internal/Magento Module Email Templates Xml.xml.ft
new file mode 100644
index 000000000..ed3c17ff9
--- /dev/null
+++ b/resources/fileTemplates/internal/Magento Module Email Templates Xml.xml.ft	
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
+</config>
diff --git a/resources/fileTemplates/internal/Magento Module Email Templates Xml.xml.html b/resources/fileTemplates/internal/Magento Module Email Templates Xml.xml.html
new file mode 100644
index 000000000..464c24c2f
--- /dev/null
+++ b/resources/fileTemplates/internal/Magento Module Email Templates Xml.xml.html	
@@ -0,0 +1,17 @@
+<!--
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<html>
+<body>
+<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
+    <tr>
+        <td>
+            <font face="verdana" size="-1">Email templates configurations.</font>
+        </td>
+    </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/magento2/common.properties b/resources/magento2/common.properties
index b72dad68b..e6b406f14 100644
--- a/resources/magento2/common.properties
+++ b/resources/magento2/common.properties
@@ -64,3 +64,8 @@ common.addToolbarFullTextSearch=Add Toolbar Full Text Search
 common.addToolbarColumnsControl=Add Toolbar Columns Control
 common.addToolbarBookmarks=Add Toolbar Bookmarks
 common.argument=Argument name
+common.template.id=Template ID
+common.template.label=Template Label
+common.template.filename=Template File Name
+common.template.subject=Email Subject
+common.template.type=Email Type
\ No newline at end of file
diff --git a/src/com/magento/idea/magento2plugin/actions/CopyMagentoPath.java b/src/com/magento/idea/magento2plugin/actions/CopyMagentoPath.java
index 9ba6a9405..1e88d84f4 100644
--- a/src/com/magento/idea/magento2plugin/actions/CopyMagentoPath.java
+++ b/src/com/magento/idea/magento2plugin/actions/CopyMagentoPath.java
@@ -12,6 +12,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
 import org.jetbrains.annotations.NotNull;
@@ -24,13 +25,15 @@ public class CopyMagentoPath extends CopyPathProvider {
     private final String[] templatePaths = {
         "view/frontend/templates/",
         "view/adminhtml/templates/",
-        "view/base/templates/"
+        "view/base/templates/",
+        "templates/"
     };
 
     @Override
     public void update(@NotNull final AnActionEvent event) {
         final VirtualFile virtualFile = event.getData(PlatformDataKeys.VIRTUAL_FILE);
-        if (virtualFile != null && virtualFile.isDirectory()) {
+        if (virtualFile != null && virtualFile.isDirectory()
+                || virtualFile != null && !PHTML.equals(virtualFile.getExtension())) {
             event.getPresentation().setVisible(false);
         }
     }
@@ -42,11 +45,22 @@ public String getPathToElement(
             @Nullable final VirtualFile virtualFile,
             @Nullable final Editor editor
     ) {
-        final PsiDirectory directory
-                = PsiManager.getInstance(project).findFile(virtualFile).getContainingDirectory();
+        if (virtualFile == null) {
+            return null;
+        }
+        final PsiFile file
+                = PsiManager.getInstance(project).findFile(virtualFile);
+        if (file == null) {
+            return null;
+        }
+        final PsiDirectory directory = file.getContainingDirectory();
+        final String moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
+        if (moduleName == null) {
+            return null;
+        }
         final StringBuilder fullPath = new StringBuilder(virtualFile.getPath());
         final StringBuilder magentoPath
-                = new StringBuilder(GetModuleNameByDirectoryUtil.execute(directory, project));
+                = new StringBuilder(moduleName);
         String path = fullPath.toString();
 
         if (PHTML.equals(virtualFile.getExtension())) {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/NewEmailTemplateAction.java b/src/com/magento/idea/magento2plugin/actions/generation/NewEmailTemplateAction.java
new file mode 100644
index 000000000..78a99904b
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/actions/generation/NewEmailTemplateAction.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation;
+
+import com.intellij.ide.IdeView;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CommonDataKeys;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDirectory;
+import com.magento.idea.magento2plugin.MagentoIcons;
+import com.magento.idea.magento2plugin.actions.generation.dialog.NewEmailTemplateDialog;
+
+@SuppressWarnings({"PMD.OnlyOneReturn", "PMD.FieldNamingConventions"})
+public class NewEmailTemplateAction extends AnAction {
+    public static final String ACTION_NAME = "Magento 2 Email Template";
+    public static final String ACTION_DESCRIPTION = "Create a new Magento 2 email template";
+
+    /**
+     * New email template action constructor.
+     */
+    public NewEmailTemplateAction() {
+        super(ACTION_NAME, ACTION_DESCRIPTION, MagentoIcons.MODULE);
+    }
+
+    @Override
+    public void actionPerformed(final AnActionEvent event) {
+        final DataContext dataContext = event.getDataContext();
+        final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
+
+        if (view == null) {
+            return;
+        }
+
+        final Project project = CommonDataKeys.PROJECT.getData(dataContext);
+        if (project == null) {
+            return;
+        }
+
+        final PsiDirectory directory = view.getOrChooseDirectory();
+        if (directory == null) {
+            return;
+        }
+
+        NewEmailTemplateDialog.open(project, directory);
+    }
+
+    @Override
+    public boolean isDumbAware() {
+        return false;
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/EmailTemplateHtmlData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/EmailTemplateHtmlData.java
new file mode 100644
index 000000000..1385503f4
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/actions/generation/data/EmailTemplateHtmlData.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.data;
+
+@SuppressWarnings({"PMD.DataClass"})
+public class EmailTemplateHtmlData {
+    private final String module;
+    private final String fileName;
+    private final String area;
+    private final String subject;
+    private final String type;
+
+    /**
+     * Email template HTML data constructor.
+     *
+     * @param module String
+     * @param area String
+     * @param subject String
+     * @param type String
+     */
+    public EmailTemplateHtmlData(
+            final String module,
+            final String fileName,
+            final String area,
+            final String subject,
+            final String type
+    ) {
+        this.module = module;
+        this.fileName = fileName;
+        this.area = area;
+        this.subject = subject;
+        this.type = type;
+    }
+
+    /**
+     * Get module name.
+     *
+     * @return String
+     */
+    public String getModule() {
+        return module;
+    }
+
+    /**
+     * Get file name.
+     *
+     * @return String
+     */
+    public String getFileName() {
+        return fileName;
+    }
+
+    /**
+     * Get area.
+     *
+     * @return String
+     */
+    public String getArea() {
+        return area;
+    }
+
+    /**
+     * Get subject.
+     *
+     * @return String
+     */
+    public String getSubject() {
+        return subject;
+    }
+
+    /**
+     * Get type.
+     *
+     * @return String
+     */
+    public String getType() {
+        return type;
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/EmailTemplatesXmlData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/EmailTemplatesXmlData.java
new file mode 100644
index 000000000..c2ae8c1d2
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/actions/generation/data/EmailTemplatesXmlData.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.data;
+
+@SuppressWarnings({"PMD.DataClass"})
+public class EmailTemplatesXmlData {
+    private final String module;
+    private final String emailTemplateId;
+    private final String label;
+    private final String templateFileName;
+    private final String type;
+    private final String area;
+
+    /**
+     * Email templates data constructor.
+     *
+     * @param module String
+     * @param emailTemplateId String
+     * @param label String
+     * @param templateFileName String
+     * @param type String
+     * @param area String
+     */
+    public EmailTemplatesXmlData(
+            final String module,
+            final String emailTemplateId,
+            final String label,
+            final String templateFileName,
+            final String type,
+            final String area
+    ) {
+        this.module = module;
+        this.emailTemplateId = emailTemplateId;
+        this.label = label;
+        this.templateFileName = templateFileName;
+        this.type = type;
+        this.area = area;
+    }
+
+    /**
+     * Get template file name.
+     *
+     * @return String
+     */
+    public String getTemplateFileName() {
+        return templateFileName;
+    }
+
+    /**
+     * Get ID.
+     *
+     * @return String
+     */
+    public String getId() {
+        return emailTemplateId;
+    }
+
+    /**
+     * Get label.
+     *
+     * @return String
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Get module.
+     *
+     * @return String
+     */
+    public String getModule() {
+        return module;
+    }
+
+    /**
+     * Get type.
+     *
+     * @return String
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Get area.
+     *
+     * @return String
+     */
+    public String getArea() {
+        return area;
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/ModuleXmlData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/ModuleXmlData.java
index fdab50588..d31528952 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/data/ModuleXmlData.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/data/ModuleXmlData.java
@@ -6,6 +6,7 @@
 package com.magento.idea.magento2plugin.actions.generation.data;
 
 import com.intellij.psi.PsiDirectory;
+import java.util.List;
 
 @SuppressWarnings({"PMD.DataClass"})
 public class ModuleXmlData {
@@ -13,6 +14,7 @@ public class ModuleXmlData {
     private final String moduleName;
     private final String setupVersion;
     private final PsiDirectory baseDir;
+    private final List<String> moduleSequences;
     private final boolean createModuleDirs;
 
     /**
@@ -29,12 +31,14 @@ public ModuleXmlData(
             final String moduleName,
             final String setupVersion,
             final PsiDirectory baseDir,
+            final List<String> moduleSequences,
             final boolean createModuleDirs
     ) {
         this.packageName = packageName;
         this.moduleName = moduleName;
         this.setupVersion = setupVersion;
         this.baseDir = baseDir;
+        this.moduleSequences = moduleSequences;
         this.createModuleDirs = createModuleDirs;
     }
 
@@ -54,6 +58,10 @@ public String getSetupVersion() {
         return this.setupVersion;
     }
 
+    public List<String> getModuleSequences() {
+        return moduleSequences;
+    }
+
     public boolean isCreateModuleDirs() {
         return this.createModuleDirs;
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java
index 944a3216e..da3e82bf8 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java
@@ -232,7 +232,7 @@ public static void open(
     }
 
     private void createUIComponents() {
-        final List<String> allModulesList = ModuleIndex.getInstance(project)
+        final List<String> allModulesList = new ModuleIndex(project)
                 .getEditableModuleNames();
 
         this.pluginModule = new FilteredComboBox(allModulesList);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java
index 6d6d2e4f6..519a78c77 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java
@@ -192,7 +192,7 @@ public String getObserverModule() {
     }
 
     private void createUIComponents() { //NOPMD
-        final List<String> allModulesList = ModuleIndex.getInstance(project)
+        final List<String> allModulesList = new ModuleIndex(project)
                 .getEditableModuleNames();
 
         this.observerModule = new FilteredComboBox(allModulesList);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEmailTemplateDialog.form b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEmailTemplateDialog.form
new file mode 100644
index 000000000..1c074587b
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEmailTemplateDialog.form
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.magento.idea.magento2plugin.actions.generation.dialog.NewEmailTemplateDialog">
+  <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="10" left="10" bottom="10" right="10"/>
+    <constraints>
+      <xy x="48" y="54" width="436" height="297"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <grid id="94766" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <hspacer id="98af6">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+          </hspacer>
+          <grid id="9538f" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="true" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="e7465" class="javax.swing.JButton" binding="buttonOK">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text resource-bundle="magento2/common" key="common.ok"/>
+                </properties>
+              </component>
+              <component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text resource-bundle="magento2/common" key="common.cancel"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+        </children>
+      </grid>
+      <grid id="e3588" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="320c8" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="magento2/common" key="common.template.id"/>
+            </properties>
+          </component>
+          <component id="dcdb0" class="javax.swing.JTextField" binding="identifier">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="c7eac" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="magento2/common" key="common.template.label"/>
+            </properties>
+          </component>
+          <component id="35e0c" class="javax.swing.JTextField" binding="label">
+            <constraints>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="65e98" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="magento2/common" key="common.template.filename"/>
+            </properties>
+          </component>
+          <component id="f244b" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="magento2/common" key="common.template.type"/>
+            </properties>
+          </component>
+          <component id="33fd6" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="magento2/common" key="common.area.target"/>
+            </properties>
+          </component>
+          <component id="617b5" class="javax.swing.JTextField" binding="fileName">
+            <constraints>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="bfac1" class="com.magento.idea.magento2plugin.ui.FilteredComboBox" binding="area" custom-create="true">
+            <constraints>
+              <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <toolTipText value=""/>
+            </properties>
+            <clientProperties>
+              <html.disable class="java.lang.Boolean" value="false"/>
+            </clientProperties>
+          </component>
+          <component id="c5b33" class="com.magento.idea.magento2plugin.ui.FilteredComboBox" binding="templateType" custom-create="true">
+            <constraints>
+              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <toolTipText value=""/>
+            </properties>
+            <clientProperties>
+              <html.disable class="java.lang.Boolean" value="false"/>
+            </clientProperties>
+          </component>
+          <component id="285c1" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="magento2/common" key="common.template.subject"/>
+            </properties>
+          </component>
+          <component id="56e46" class="javax.swing.JTextField" binding="subject">
+            <constraints>
+              <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+        </children>
+      </grid>
+    </children>
+  </grid>
+</form>
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEmailTemplateDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEmailTemplateDialog.java
new file mode 100644
index 000000000..748f283b8
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEmailTemplateDialog.java
@@ -0,0 +1,257 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.dialog;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDirectory;
+import com.magento.idea.magento2plugin.actions.generation.NewEmailTemplateAction;
+import com.magento.idea.magento2plugin.actions.generation.data.EmailTemplateHtmlData;
+import com.magento.idea.magento2plugin.actions.generation.data.EmailTemplatesXmlData;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.FieldValidation;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.annotation.RuleRegistry;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.dialog.NewEmailTemplateDialogValidator;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.IdentifierRule;
+import com.magento.idea.magento2plugin.actions.generation.dialog.validator.rule.NotEmptyRule;
+import com.magento.idea.magento2plugin.actions.generation.generator.ModuleEmailTemplateHtmlGenerator;
+import com.magento.idea.magento2plugin.actions.generation.generator.ModuleEmailTemplatesXmlGenerator;
+import com.magento.idea.magento2plugin.magento.files.EmailTemplateHtml;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
+import com.magento.idea.magento2plugin.ui.FilteredComboBox;
+import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
+
+public class NewEmailTemplateDialog extends AbstractDialog {
+    private final String moduleName;
+    private final Project project;
+    private final NewEmailTemplateDialogValidator validator;
+    private static final String EMAIL_TEMPLATE_ID = "id";
+    private static final String LABEL = "label";
+    private static final String FILENAME = "file name";
+    private JPanel contentPane;
+    private JButton buttonOK;
+    private JButton buttonCancel;
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, EMAIL_TEMPLATE_ID})
+    @FieldValidation(rule = RuleRegistry.IDENTIFIER,
+            message = {IdentifierRule.MESSAGE, EMAIL_TEMPLATE_ID})
+    private JTextField identifier;
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, LABEL})
+    private JTextField label;
+    @FieldValidation(rule = RuleRegistry.NOT_EMPTY,
+            message = {NotEmptyRule.MESSAGE, FILENAME})
+    @FieldValidation(rule = RuleRegistry.IDENTIFIER,
+            message = {IdentifierRule.MESSAGE, FILENAME})
+    private JTextField fileName;
+    private FilteredComboBox area;
+    private FilteredComboBox templateType;
+    private JTextField subject;
+
+    /**
+     * New email template dialog.
+     *
+     * @param project Project
+     * @param directory Directory
+     */
+    public NewEmailTemplateDialog(final Project project, final PsiDirectory directory) {
+        super();
+        setContentPane(contentPane);
+        setModal(true);
+        getRootPane().setDefaultButton(buttonOK);
+        this.project = project;
+        this.validator = new NewEmailTemplateDialogValidator(project);
+        this.moduleName = GetModuleNameByDirectoryUtil.execute(directory, project);
+
+        buttonOK.addActionListener(e -> onOK());
+        buttonCancel.addActionListener(e -> onCancel());
+
+        // call onCancel() when cross is clicked
+        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+        addWindowListener(new WindowAdapter() {
+            public void windowClosing(final WindowEvent windowEvent) {
+                onCancel();
+            }
+        });
+
+        // call onCancel() on ESCAPE
+        contentPane.registerKeyboardAction(
+                new ActionListener() {
+                    public void actionPerformed(final ActionEvent actionEvent) {
+                        onCancel();
+                    }
+                },
+                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
+                JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
+        );
+    }
+
+    /**
+     * Get email template data.
+     *
+     * @return EmailTemplatesData
+     */
+    public EmailTemplatesXmlData getEmailTemplateData() {
+        return new EmailTemplatesXmlData(
+                getModuleName(),
+                getIdentifier(),
+                getLabel(),
+                getFileName(),
+                getTemplateType(),
+                getArea()
+        );
+    }
+
+    /**
+     * Get email template HTML data.
+     *
+     * @return EmailTemplateHtmlData
+     */
+    public EmailTemplateHtmlData getEmailTemplateHtmlData() {
+        return new EmailTemplateHtmlData(
+                getModuleName(),
+                getFileName(),
+                getArea(),
+                getSubject(),
+                getTemplateType()
+        );
+    }
+
+    /**
+     * Get identifier.
+     *
+     * @return String
+     */
+    public String getIdentifier() {
+        return identifier.getText().trim();
+    }
+
+    /**
+     * Get label.
+     *
+     * @return String
+     */
+    public String getLabel() {
+        return label.getText().trim();
+    }
+
+    /**
+     * Get subject.
+     *
+     * @return String
+     */
+    public String getSubject() {
+        return subject.getText().trim();
+    }
+
+    /**
+     * Get file name.
+     *
+     * @return String
+     */
+    public String getFileName() {
+        return fileName.getText().trim();
+    }
+
+    /**
+     * Get area.
+     *
+     * @return String
+     */
+    public String getArea() {
+        return area.getSelectedItem().toString();
+    }
+
+    /**
+     * Get template type.
+     *
+     * @return String
+     */
+    public String getTemplateType() {
+        return templateType.getSelectedItem().toString();
+    }
+
+    /**
+     * Open new controller dialog.
+     *
+     * @param project Project
+     * @param directory PsiDirectory
+     */
+    public static void open(final Project project, final PsiDirectory directory) {
+        final NewEmailTemplateDialog dialog = new NewEmailTemplateDialog(project, directory);
+        dialog.pack();
+        dialog.centerDialog(dialog);
+        dialog.setVisible(true);
+    }
+
+    private String getModuleName() {
+        return this.moduleName;
+    }
+
+    private void onOK() {
+        final boolean emailTemplateCanBeDeclared = !this.validator.validate(this);
+        if (!validateFormFields() || emailTemplateCanBeDeclared) {
+            return;
+        }
+
+        generateFile();
+        this.setVisible(false);
+    }
+
+    private void generateFile() {
+        final ModuleEmailTemplateHtmlGenerator moduleEmailTemplateHtmlGenerator;
+        moduleEmailTemplateHtmlGenerator = new ModuleEmailTemplateHtmlGenerator(
+                this.getEmailTemplateHtmlData(),
+                project
+        );
+        moduleEmailTemplateHtmlGenerator.generate(NewEmailTemplateAction.ACTION_NAME);
+        final ModuleEmailTemplatesXmlGenerator xmlGenerator = new ModuleEmailTemplatesXmlGenerator(
+                this.getEmailTemplateData(),
+                project
+        );
+        xmlGenerator.generate(NewEmailTemplateAction.ACTION_NAME, true);
+    }
+
+    protected void onCancel() {
+        // add your code here if necessary
+        dispose();
+    }
+
+    @SuppressWarnings({"PMD.UnusedPrivateMethod"})
+    private void createUIComponents() {
+        this.area = new FilteredComboBox(getAreaList());
+        this.templateType = new FilteredComboBox(getTypeList());
+    }
+
+    private List<String> getAreaList() {
+        return new ArrayList<>(
+                Arrays.asList(
+                        Areas.frontend.toString(),
+                        Areas.adminhtml.toString()
+                )
+        );
+    }
+
+    private List<String> getTypeList() {
+        return new ArrayList<>(
+                Arrays.asList(
+                        EmailTemplateHtml.HTML_TYPE,
+                        EmailTemplateHtml.TEXT_TYPE
+                )
+        );
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java
index 39ad2aea8..3860ca220 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java
@@ -434,7 +434,7 @@ private EntityCreatorContextData getEntityCreatorContextData(
                 dtoModelNamespace,
                 dtoInterfaceNamespace,
                 formViewNamespaceBuilder,
-                NewActionFile.getNamespaceBuilder(moduleName, entityName),
+                new NewActionFile(moduleName, entityName).getNamespaceBuilder(),
                 getEntityProperties(),
                 getButtons(),
                 getFieldSets(),
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java
index 99cf87247..2d653546f 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModuleDialog.java
@@ -123,7 +123,7 @@ public NewModuleDialog(
         this.project = project;
         this.initialBaseDir = initialBaseDir;
         this.camelCaseToHyphen = CamelCaseToHyphen.getInstance();
-        this.moduleIndex = ModuleIndex.getInstance(project);
+        this.moduleIndex = new ModuleIndex(project);
         detectPackageName(initialBaseDir);
         setContentPane(contentPane);
         setModal(true);
@@ -213,6 +213,7 @@ private void generateModuleXml() {
                 getModuleName(),
                 getSetupVersion(),
                 getBaseDir(),
+                getModuleDependencies(),
                 true
         ), project).generate(NewModuleAction.actionName, true);
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java
index 5cd36c2b2..9bc68139d 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java
@@ -237,7 +237,7 @@ public static void open(final @NotNull Project project, final PhpClass targetCla
     }
 
     private void createUIComponents() {
-        final List<String> allModulesList = ModuleIndex.getInstance(project)
+        final List<String> allModulesList = new ModuleIndex(project)
                 .getEditableModuleNames();
 
         this.preferenceModule = new FilteredComboBox(allModulesList);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java
index e6b540d5b..a5e854c87 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideInThemeDialog.java
@@ -131,7 +131,7 @@ public static void open(final @NotNull Project project, final PsiFile psiFile) {
     }
 
     private void fillThemeOptions() {
-        final List<String> themeNames = ModuleIndex.getInstance(project).getEditableThemeNames();
+        final List<String> themeNames = new ModuleIndex(project).getEditableThemeNames();
         for (final String themeName: themeNames) {
             theme.addItem(themeName);
         }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/dialog/NewEmailTemplateDialogValidator.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/dialog/NewEmailTemplateDialogValidator.java
new file mode 100644
index 000000000..3aa893aff
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/actions/generation/dialog/validator/dialog/NewEmailTemplateDialogValidator.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.dialog.validator.dialog;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import com.magento.idea.magento2plugin.actions.generation.data.EmailTemplateHtmlData;
+import com.magento.idea.magento2plugin.actions.generation.data.EmailTemplatesXmlData;
+import com.magento.idea.magento2plugin.actions.generation.dialog.NewEmailTemplateDialog;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
+import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
+import com.magento.idea.magento2plugin.magento.files.EmailTemplatesXml;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
+import com.magento.idea.magento2plugin.magento.packages.Package;
+import com.magento.idea.magento2plugin.util.magento.FileBasedIndexUtil;
+import com.magento.idea.magento2plugin.util.xml.XmlPsiTreeUtil;
+import java.util.Collection;
+import javax.swing.JOptionPane;
+
+public class NewEmailTemplateDialogValidator {
+    private final ValidatorBundle validatorBundle;
+    private final CommonBundle commonBundle;
+    private final Project project;
+
+    /**
+     * Constructor.
+     */
+    public NewEmailTemplateDialogValidator(final Project project) {
+        this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
+        this.project = project;
+    }
+
+    /**
+     * Validate dialog.
+     *
+     * @param dialog NewEmailTemplateDialog
+     * @return boolean
+     */
+    public boolean validate(final NewEmailTemplateDialog dialog) {
+        final EmailTemplatesXmlData emailTemplatesXmlData = dialog.getEmailTemplateData();
+        final String errorTitle = commonBundle.message("common.error");
+        final EmailTemplateHtmlData emailTemplateHtmlData = dialog.getEmailTemplateHtmlData();
+
+        if (isTemplateFileAlreadyExists(emailTemplateHtmlData)) {
+            final String templateFileName = emailTemplatesXmlData.getTemplateFileName();
+            final String errorMessage = this.validatorBundle.message(
+                    "validator.alreadyDeclared",
+                    String.format("%s Email Template File", templateFileName),
+                    emailTemplatesXmlData.getModule()
+            );
+            JOptionPane.showMessageDialog(
+                    null,
+                    errorMessage,
+                    errorTitle,
+                    JOptionPane.ERROR_MESSAGE
+            );
+
+            return false;
+        }
+
+        if (isTemplateTagAlreadyExists(emailTemplatesXmlData)) {
+            final String errorMessage = this.validatorBundle.message(
+                    "validator.alreadyDeclared",
+                    String.format("%s Email Template", emailTemplatesXmlData.getId()),
+                    emailTemplatesXmlData.getModule()
+            );
+            JOptionPane.showMessageDialog(
+                    null,
+                    errorMessage,
+                    errorTitle,
+                    JOptionPane.ERROR_MESSAGE
+            );
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Is template tag already exists.
+     *
+     * @param emailTemplatesXmlData email templates XML data
+     *
+     * @return bool
+     */
+    private boolean isTemplateTagAlreadyExists(final EmailTemplatesXmlData emailTemplatesXmlData) {
+        final EmailTemplatesXml emailTemplatesXml = new EmailTemplatesXml();
+        final XmlFile emailTemplatesFile = (XmlFile) FileBasedIndexUtil.findModuleConfigFile(
+                emailTemplatesXml.getFileName(),
+                Areas.base,
+                emailTemplatesXmlData.getModule(),
+                project
+        );
+
+        if (emailTemplatesFile == null) {
+            return false;
+        }
+
+        final Collection<XmlAttributeValue> attributes = XmlPsiTreeUtil.findAttributeValueElements(
+                emailTemplatesFile,
+                EmailTemplatesXml.TEMPLATE_TAG,
+                EmailTemplatesXml.TEMPLATE_ID_ATTRIBUTE,
+                emailTemplatesXmlData.getId()
+        );
+
+        for (final XmlAttributeValue emailTemplateAttribute: attributes) {
+            final XmlTag templateXmlTag = PsiTreeUtil.getParentOfType(
+                    emailTemplateAttribute,
+                    XmlTag.class
+            );
+            final String existingTemplateArea = templateXmlTag.getAttribute("area").getValue();
+
+            if (existingTemplateArea.equals(emailTemplatesXmlData.getArea())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Is template file already exists.
+     *
+     * @param emailTemplateData EmailTemplateHtmlData
+     * @return boolean
+     */
+    private boolean isTemplateFileAlreadyExists(
+            final EmailTemplateHtmlData emailTemplateData
+    ) {
+        final PsiFile templateFile = FileBasedIndexUtil.findModuleViewFile(
+                emailTemplateData.getFileName(),
+                getArea(emailTemplateData.getArea()),
+                emailTemplateData.getModule(),
+                project,
+                Package.moduleViewEmailDir
+        );
+
+        return templateFile != null;
+    }
+
+    private Areas getArea(final String area) {
+        return Areas.getAreaByString(area);
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/CLICommandClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/CLICommandClassGenerator.java
index aea7d454f..7e00fe79a 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/CLICommandClassGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/CLICommandClassGenerator.java
@@ -48,7 +48,7 @@ public CLICommandClassGenerator(
         this.phpClassData = phpClassData;
 
         this.dirGenerator = DirectoryGenerator.getInstance();
-        this.fileGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileGenerator = new FileFromTemplateGenerator(project);
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
     }
@@ -83,7 +83,7 @@ private PhpFile createCLICommandClass(final String actionName) {
     private PsiDirectory getParentDirectory() {
         final String moduleName = this.phpClassData.getModuleName();
         final String[] subDirectories = this.phpClassData.getParentDirectory().split("/");
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
         for (final String subDirectory : subDirectories) {
             parentDirectory = dirGenerator.findOrCreateSubdirectory(parentDirectory, subDirectory);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/CronjobClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/CronjobClassGenerator.java
index 5d05e808f..49010dd5e 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/CronjobClassGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/CronjobClassGenerator.java
@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
 import com.intellij.openapi.project.Project;
@@ -14,87 +15,98 @@
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.magento.files.CronjobTemplate;
-import org.jetbrains.annotations.NotNull;
 import java.util.Properties;
+import org.jetbrains.annotations.NotNull;
 
 public class CronjobClassGenerator extends FileGenerator {
-    private CronjobClassData cronjobClassData;
-    private Project project;
-    private ValidatorBundle validatorBundle;
+    private final CronjobClassData cronjobClassData;
+    private final Project project;
+    private final ValidatorBundle validatorBundle;
     private final DirectoryGenerator directoryGenerator;
     private final FileFromTemplateGenerator fileFromTemplateGenerator;
 
     /**
-     * @param project
-     * @param cronjobClassData
+     * Construct generator.
+     *
+     * @param project Project
+     * @param cronjobClassData CronjobClassData
      */
-    public CronjobClassGenerator(Project project, @NotNull CronjobClassData cronjobClassData) {
+    public CronjobClassGenerator(
+            final Project project,
+            final @NotNull CronjobClassData cronjobClassData
+    ) {
         super(project);
         this.project = project;
         this.cronjobClassData = cronjobClassData;
 
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.validatorBundle = new ValidatorBundle();
     }
 
     /**
+     * Generate file from code template.
      *
-     * @param actionName
+     * @param actionName String
      *
      * @return void
      */
-    public PsiFile generate(String actionName) {
-        PhpFile cronjobFile = createCronjobClass(actionName);
+    @Override
+    public PsiFile generate(final String actionName) {
+        final PhpFile cronjobFile = createCronjobClass(actionName);
 
         if (cronjobFile == null) {
-            String errorMessage = validatorBundle.message(
-            "validator.file.cantBeCreated",
-            "Cronjob Class"
+            final String errorMessage = validatorBundle.message(
+                    "validator.file.cantBeCreated",
+                    "Cronjob Class"
             );
 
-            throw new RuntimeException(errorMessage);
+            throw new RuntimeException(errorMessage);//NOPMD
         }
 
         return cronjobFile;
     }
 
     /**
+     * Fill template attributes.
      *
-     * @param attributes
+     * @param attributes Properties
      */
-    protected void fillAttributes(Properties attributes) {
-        String cronjobClassName = this.cronjobClassData.getClassName();
-        String cronjobNamespace = this.cronjobClassData.getNamespace();
+    @Override
+    protected void fillAttributes(final Properties attributes) {
+        final String cronjobClassName = this.cronjobClassData.getClassName();
+        final String cronjobNamespace = this.cronjobClassData.getNamespace();
 
         attributes.setProperty("NAME", cronjobClassName);
         attributes.setProperty("NAMESPACE", cronjobNamespace);
     }
 
     /**
-     * Generate Cronjob Class according to data model
+     * Generate Cronjob Class according to data model.
      *
-     * @param actionName
+     * @param actionName String
      *
      * @return PhpFile
      */
-    private PhpFile createCronjobClass(String actionName) {
-        String cronjobClassName = this.cronjobClassData.getClassName();
-        String moduleName = this.cronjobClassData.getModuleName();
-        String[] cronjobSubDirectories = this.cronjobClassData.getDirectory().split("/");
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project).getModuleDirectoryByModuleName(moduleName);
-
-        for (String cronjobSubDirectory: cronjobSubDirectories) {
-            parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, cronjobSubDirectory);
+    private PhpFile createCronjobClass(final String actionName) {
+        final String cronjobClassName = this.cronjobClassData.getClassName();
+        final String moduleName = this.cronjobClassData.getModuleName();
+        final String[] cronjobSubDirectories = this.cronjobClassData.getDirectory().split("/");
+        PsiDirectory parentDirectory = new ModuleIndex(project)
+                .getModuleDirectoryByModuleName(moduleName);
+
+        for (final String cronjobSubDirectory: cronjobSubDirectories) {
+            parentDirectory = directoryGenerator
+                    .findOrCreateSubdirectory(parentDirectory, cronjobSubDirectory);
         }
 
-        Properties attributes = getAttributes();
+        final Properties attributes = getAttributes();
 
-        PsiFile blockFile = fileFromTemplateGenerator.generate(
-            new CronjobTemplate(cronjobClassName),
-            attributes,
-            parentDirectory,
-            actionName
+        final PsiFile blockFile = fileFromTemplateGenerator.generate(
+                new CronjobTemplate(cronjobClassName),
+                attributes,
+                parentDirectory,
+                actionName
         );
 
         if (blockFile == null) {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelGenerator.java
index 856e05311..446e68091 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelGenerator.java
@@ -52,7 +52,7 @@ public DataModelGenerator(
         this.project = project;
         this.data = data;
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
@@ -110,7 +110,7 @@ public PsiFile generate(final @NotNull String actionName) {
      * @return PhpClass
      */
     private PhpClass createModel(final @NotNull String actionName) {
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        final PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(data.getModuleName());
         final PsiDirectory dataModelDirectory = directoryGenerator.findOrCreateSubdirectories(
                 parentDirectory,
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelInterfaceGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelInterfaceGenerator.java
index ba1f55ebc..39df57d5a 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelInterfaceGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/DataModelInterfaceGenerator.java
@@ -49,7 +49,7 @@ public DataModelInterfaceGenerator(
         this.project = project;
         this.data = data;
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
@@ -107,7 +107,7 @@ public PsiFile generate(final String actionName) {
      * @return PhpClass
      */
     private PhpClass createInterface(final @NotNull String actionName) {
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        final PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(data.getModuleName());
         final PsiDirectory dtoInterfaceDirectory = directoryGenerator
                 .findOrCreateSubdirectories(parentDirectory, DataModelInterfaceFile.DIRECTORY);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityByIdCommandGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityByIdCommandGenerator.java
index bcae49773..b27e13447 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityByIdCommandGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityByIdCommandGenerator.java
@@ -63,9 +63,9 @@ public DeleteEntityByIdCommandGenerator(
         this.data = data;
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
         file = new DeleteEntityByIdCommandFile(data.getEntityName());
     }
 
@@ -110,10 +110,11 @@ public PsiFile generate(final @NotNull String actionName) {
     @Override
     protected void fillAttributes(final @NotNull Properties attributes) {
         final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
-        final ModelFile modelFile = new ModelFile(data.getModelName());
-        final String modelType = modelFile.getNamespaceBuilder(data.getModuleName()).getClassFqn();
+        final ModelFile modelFile = new ModelFile(data.getModuleName(), data.getModelName());
+        final String modelType = modelFile.getClassFqn();
         final String modelFactoryType = modelType.concat("Factory");
-        final ResourceModelFile resourceFile = new ResourceModelFile(data.getResourceModelName());
+        final ResourceModelFile resourceFile =
+                new ResourceModelFile(data.getModuleName(), data.getResourceModelName());
 
         phpClassTypesBuilder
                 .appendProperty("ENTITY_NAME", data.getEntityName())
@@ -127,8 +128,7 @@ protected void fillAttributes(final @NotNull Properties attributes) {
                 .append("LOGGER", FrameworkLibraryType.LOGGER.getType())
                 .append("MODEL", modelType)
                 .append("MODEL_FACTORY", modelFactoryType)
-                .append("RESOURCE",
-                        resourceFile.getNamespaceBuilder(data.getModuleName()).getClassFqn())
+                .append("RESOURCE", resourceFile.getClassFqn())
                 .mergeProperties(attributes);
 
         attributes.setProperty("USES",
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityControllerFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityControllerFileGenerator.java
index 7d96be42c..d7412404d 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityControllerFileGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityControllerFileGenerator.java
@@ -1,14 +1,15 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiFile;
 import com.magento.idea.magento2plugin.actions.generation.data.DeleteEntityControllerFileData;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassGeneratorUtil;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassTypesBuilder;
-import com.magento.idea.magento2plugin.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
 import com.magento.idea.magento2plugin.magento.files.actions.DeleteActionFile;
 import com.magento.idea.magento2plugin.magento.files.commands.DeleteEntityByIdCommandFile;
 import com.magento.idea.magento2plugin.magento.packages.HttpMethod;
@@ -18,54 +19,42 @@
 import java.util.Properties;
 import org.jetbrains.annotations.NotNull;
 
-public class DeleteEntityControllerFileGenerator extends FileGenerator {
+public class DeleteEntityControllerFileGenerator extends PhpFileGenerator {
 
     private final DeleteEntityControllerFileData data;
-    private final FileFromTemplateGenerator fileFromTemplateGenerator;
-    private final DirectoryGenerator directoryGenerator;
-    private final ModuleIndex moduleIndex;
-    private final DeleteActionFile file;
 
     /**
      * Delete Entity Controller File Generator.
+     *
      * @param data DeleteEntityControllerFileData
      * @param project Project
      */
     public DeleteEntityControllerFileGenerator(
-            final DeleteEntityControllerFileData data,
+            final @NotNull DeleteEntityControllerFileData data,
             final @NotNull Project project
     ) {
-        super(project);
-        this.data = data;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        moduleIndex = ModuleIndex.getInstance(project);
-        directoryGenerator = DirectoryGenerator.getInstance();
-        file = new DeleteActionFile(data.getEntityName());
+        this(data, project, true);
     }
 
     /**
-     * Generate Delete controller.
-     *
-     * @param actionName String
+     * Delete Entity Controller File Generator.
      *
-     * @return PsiFile
+     * @param data DeleteEntityControllerFileData
+     * @param project Project
+     * @param checkFileAlreadyExists boolean
      */
-    @Override
-    public PsiFile generate(final @NotNull String actionName) {
-        final PsiDirectory moduleBaseDir = moduleIndex.getModuleDirectoryByModuleName(
-                data.getModuleName()
-        );
-        final PsiDirectory baseDirectory = directoryGenerator.findOrCreateSubdirectories(
-                moduleBaseDir,
-                file.getDirectory()
-        );
+    public DeleteEntityControllerFileGenerator(
+            final @NotNull DeleteEntityControllerFileData data,
+            final @NotNull Project project,
+            final boolean checkFileAlreadyExists
+    ) {
+        super(project, checkFileAlreadyExists);
+        this.data = data;
+    }
 
-        return fileFromTemplateGenerator.generate(
-                file,
-                getAttributes(),
-                baseDirectory,
-                actionName
-        );
+    @Override
+    protected AbstractPhpFile initFile() {
+        return new DeleteActionFile(data.getModuleName(), data.getEntityName());
     }
 
     /**
@@ -78,8 +67,7 @@ protected void fillAttributes(final @NotNull Properties attributes) {
         final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
 
         phpClassTypesBuilder
-                .appendProperty("NAMESPACE",
-                        file.getNamespaceBuilder(data.getModuleName()).getNamespace())
+                .appendProperty("NAMESPACE", file.getNamespace())
                 .appendProperty("ENTITY_NAME", data.getEntityName())
                 .appendProperty("CLASS_NAME", DeleteActionFile.CLASS_NAME)
                 .appendProperty("ADMIN_RESOURCE", data.getAcl())
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/EditEntityActionGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/EditEntityActionGenerator.java
index 7cc40a357..f3aa85d2b 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/EditEntityActionGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/EditEntityActionGenerator.java
@@ -62,8 +62,8 @@ public EditEntityActionGenerator(
         this.data = data;
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        moduleIndex = ModuleIndex.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        moduleIndex = new ModuleIndex(project);
         directoryGenerator = DirectoryGenerator.getInstance();
         file = new EditActionFile(data.getEntityName());
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/EntityDataMapperGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/EntityDataMapperGenerator.java
index 88a32b2aa..9f253259d 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/EntityDataMapperGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/EntityDataMapperGenerator.java
@@ -64,9 +64,9 @@ public EntityDataMapperGenerator(
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         file = new EntityDataMapperFile(data.getEntityName());
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
     }
 
     /**
@@ -110,7 +110,7 @@ public PsiFile generate(final @NotNull String actionName) {
     protected void fillAttributes(final @NotNull Properties attributes) {
         final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
 
-        final ModelFile modelFile = new ModelFile(data.getModelName());
+        final ModelFile modelFile = new ModelFile(data.getModuleName(), data.getModelName());
         final DataModelFile dtoFile = new DataModelFile(data.getDtoName());
         final DataModelInterfaceFile dtoInterfaceFile =
                 new DataModelInterfaceFile(data.getDtoInterfaceName());
@@ -128,10 +128,7 @@ protected void fillAttributes(final @NotNull Properties attributes) {
                 .appendProperty("CLASS_NAME", file.getClassName())
                 .append("DATA_OBJECT", FrameworkLibraryType.DATA_OBJECT.getType())
                 .append("DTO_TYPE", dtoType)
-                .append(
-                        "MAGENTO_MODEL_TYPE",
-                        modelFile.getNamespaceBuilder(data.getModuleName()).getClassFqn()
-                )
+                .append("MAGENTO_MODEL_TYPE", modelFile.getClassFqn())
                 .append("DTO_FACTORY", dtoType.concat("Factory"))
                 .append("ABSTRACT_COLLECTION", FrameworkLibraryType.ABSTRACT_COLLECTION.getType())
                 .mergeProperties(attributes);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/FileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/FileGenerator.java
index fd5a4d250..a1038ee4f 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/FileGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/FileGenerator.java
@@ -11,14 +11,22 @@
 import java.util.Properties;
 
 public abstract class FileGenerator {
-    private final Project project;
-    private final NavigateToCreatedFile navigateToCreatedFile;
+
+    protected final Project project;
+    protected final NavigateToCreatedFile navigateToCreatedFile;
 
     public FileGenerator(final Project project) {
         this.project = project;
         this.navigateToCreatedFile = NavigateToCreatedFile.getInstance();
     }
 
+    /**
+     * Generate target file.
+     *
+     * @param actionName String
+     *
+     * @return PsiFile
+     */
     public abstract PsiFile generate(final String actionName);
 
     /**
@@ -35,14 +43,26 @@ public PsiFile generate(final String actionName, final boolean openFile) {
         if (file != null && openFile) {
             navigateToCreatedFile.navigate(project, file);
         }
+
         return file;
     }
 
+    /**
+     * Get file properties.
+     *
+     * @return Properties
+     */
     protected Properties getAttributes() {
         final Properties attributes = new Properties();
         this.fillAttributes(attributes);
+
         return attributes;
     }
 
-    protected abstract void fillAttributes(Properties attributes);
+    /**
+     * Fill attributes to be accessible from the file template.
+     *
+     * @param attributes Properties
+     */
+    protected abstract void fillAttributes(final Properties attributes);
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/FormGenericButtonBlockGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/FormGenericButtonBlockGenerator.java
index 81082172f..d9f1fb566 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/FormGenericButtonBlockGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/FormGenericButtonBlockGenerator.java
@@ -63,9 +63,9 @@ public FormGenericButtonBlockGenerator(
         this.data = data;
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
         file = new FormGenericButtonBlockFile();
     }
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/GetListQueryModelGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/GetListQueryModelGenerator.java
index 71e4b615b..ce31c8c72 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/GetListQueryModelGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/GetListQueryModelGenerator.java
@@ -63,9 +63,9 @@ public GetListQueryModelGenerator(
         this.project = project;
         this.data = data;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
         file = new GetListQueryFile(data.getEntityName());
     }
 
@@ -111,9 +111,13 @@ public PsiFile generate(final @NotNull String actionName) {
     protected void fillAttributes(final @NotNull Properties attributes) {
         final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
         final CollectionModelFile collectionModelFile =
-                new CollectionModelFile(data.getCollectionName());
+                new CollectionModelFile(
+                        data.getModuleName(),
+                        data.getCollectionName(),
+                        data.getModelName()
+                );
         final NamespaceBuilder collectionNamespace =
-                collectionModelFile.getNamespaceBuilder(data.getModuleName(), data.getModelName());
+                collectionModelFile.getNamespaceBuilder();
 
         phpClassTypesBuilder
                 .appendProperty("ENTITY_NAME", data.getEntityName())
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/GridActionColumnFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/GridActionColumnFileGenerator.java
index a29d85764..1c9a5bbea 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/GridActionColumnFileGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/GridActionColumnFileGenerator.java
@@ -65,9 +65,9 @@ public GridActionColumnFileGenerator(
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         file = new GridActionColumnFile();
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
         uses = new ArrayList<>();
         classNamespaceBuilder = new NamespaceBuilder(
                 data.getModuleName(),
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/IndexActionGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/IndexActionGenerator.java
index d1e4e7da1..122fb4038 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/IndexActionGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/IndexActionGenerator.java
@@ -63,9 +63,9 @@ public IndexActionGenerator(
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         file = new IndexActionFile(data.getEntityName());
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
     }
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/MessageQueueClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/MessageQueueClassGenerator.java
index 02d5cf79f..52eb307dc 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/MessageQueueClassGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/MessageQueueClassGenerator.java
@@ -50,7 +50,7 @@ public MessageQueueClassGenerator(
 
         this.messageQueueClassDataName = messageQueueClassData;
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
@@ -112,7 +112,7 @@ protected void fillAttributes(final Properties attributes) {
     }
 
     private PhpClass createHandlerClass(final String actionName) {
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(this.moduleName);
         final PsiFile handlerFile;
         final String[] handlerDirectories = messageQueueClassDataName.getPath().split(
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java
index a52207bc4..d6b7e31e8 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java
@@ -45,7 +45,7 @@ public ModuleBlockClassGenerator(
     ) {
         super(project);
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.blockFileData = blockFileData;
         this.project = project;
         this.validatorBundle = new ValidatorBundle();
@@ -104,7 +104,7 @@ private String getBlockFqn() {
     }
 
     private PhpFile createBlockClass(final String actionName) {
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(getBlockModule());
         final String[] blockDirectories = blockFileData.getBlockDirectory().split(File.separator);
         for (final String blockDirectory: blockDirectories) {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleCollectionGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleCollectionGenerator.java
index 7431648ef..64c6c7eaf 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleCollectionGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleCollectionGenerator.java
@@ -5,39 +5,20 @@
 
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
-import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiFile;
-import com.jetbrains.php.lang.psi.PhpFile;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.actions.generation.data.CollectionData;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassGeneratorUtil;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassTypesBuilder;
-import com.magento.idea.magento2plugin.bundles.CommonBundle;
-import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
-import com.magento.idea.magento2plugin.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
 import com.magento.idea.magento2plugin.magento.files.CollectionModelFile;
 import com.magento.idea.magento2plugin.magento.files.ModelFile;
 import com.magento.idea.magento2plugin.magento.files.ResourceModelFile;
-import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
-import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import java.util.Properties;
-import javax.swing.JOptionPane;
 import org.jetbrains.annotations.NotNull;
 
-public class ModuleCollectionGenerator extends FileGenerator {
+public class ModuleCollectionGenerator extends PhpFileGenerator {
 
     private final CollectionData data;
-    private final Project project;
-    private final ValidatorBundle validatorBundle;
-    private final CommonBundle commonBundle;
-    private final GetFirstClassOfFile getFirstClassOfFile;
-    private final DirectoryGenerator directoryGenerator;
-    private final FileFromTemplateGenerator fileFromTemplateGenerator;
-    private final CollectionModelFile file;
 
     /**
      * Generates new Collection PHP Class based on provided data.
@@ -49,104 +30,32 @@ public ModuleCollectionGenerator(
             final @NotNull CollectionData data,
             final @NotNull Project project
     ) {
-        super(project);
-        this.project = project;
-        this.data = data;
-        this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
-        this.validatorBundle = new ValidatorBundle();
-        this.commonBundle = new CommonBundle();
-        file = new CollectionModelFile(data.getCollectionName());
+        this(data, project, true);
     }
 
     /**
-     * Generates collection model class.
-     *
-     * @param actionName Action name
+     * Generates new Collection PHP Class based on provided data.
      *
-     * @return PsiFile
+     * @param data CollectionData
+     * @param project Project
+     * @param checkFileAlreadyExists boolean
      */
-    @Override
-    public PsiFile generate(final @NotNull String actionName) {
-        final PsiFile[] collectionFiles = new PsiFile[1];
-
-        WriteCommandAction.runWriteCommandAction(project, () -> {
-            PhpClass collection = GetPhpClassByFQN.getInstance(project).execute(
-                    file.getNamespaceBuilder(
-                            data.getModuleName(),
-                            data.getCollectionDirectory()
-                    ).getClassFqn()
-            );
-
-            if (collection != null) {
-                final String errorMessage = this.validatorBundle.message(
-                        "validator.file.alreadyExists",
-                        "Collection Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
-                return;
-            }
-
-            collection = createClass(actionName);
-
-            if (collection == null) {
-                final String errorMessage = this.validatorBundle.message(
-                        "validator.file.cantBeCreated",
-                        "Collection Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
-                return;
-            }
-
-            collectionFiles[0] = collection.getContainingFile();
-        });
-
-        return collectionFiles[0];
+    public ModuleCollectionGenerator(
+            final @NotNull CollectionData data,
+            final @NotNull Project project,
+            final boolean checkFileAlreadyExists
+    ) {
+        super(project, checkFileAlreadyExists);
+        this.data = data;
     }
 
-    /**
-     * Create collection class.
-     *
-     * @param actionName String
-     *
-     * @return PhpClass
-     */
-    private PhpClass createClass(final @NotNull String actionName) {
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
-                .getModuleDirectoryByModuleName(data.getModuleName());
-        final PsiFile modelFile;
-
-        final PsiDirectory collectionDirectory = directoryGenerator.findOrCreateSubdirectories(
-                parentDirectory,
-                file.getDirectory(data.getCollectionDirectory())
-        );
-        final Properties attributes = getAttributes();
-
-        modelFile = fileFromTemplateGenerator.generate(
-                file,
-                attributes,
-                collectionDirectory,
-                actionName
+    @Override
+    protected AbstractPhpFile initFile() {
+        return new CollectionModelFile(
+                data.getModuleName(),
+                data.getCollectionName(),
+                data.getCollectionDirectory()
         );
-
-        if (modelFile == null) {
-            return null;
-        }
-
-        return getFirstClassOfFile.execute((PhpFile) modelFile);
     }
 
     /**
@@ -159,33 +68,23 @@ protected void fillAttributes(final @NotNull Properties attributes) {
         final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
 
         final ResourceModelFile resourceModelFile =
-                new ResourceModelFile(data.getResourceModelName());
-        final ModelFile modelFile = new ModelFile(data.getModelName());
+                new ResourceModelFile(data.getModuleName(), data.getResourceModelName());
+        final ModelFile modelFile = new ModelFile(data.getModuleName(), data.getModelName());
 
         phpClassTypesBuilder.appendProperty("NAME", data.getCollectionName())
-                .appendProperty(
-                        "NAMESPACE",
-                        file.getNamespaceBuilder(
-                                data.getModuleName(),
-                                data.getCollectionDirectory()
-                        ).getNamespace()
-                )
+                .appendProperty("NAMESPACE", file.getNamespaceBuilder().getNamespace())
                 .appendProperty("DB_NAME", data.getDbTableName())
                 .appendProperty("MODEL", data.getModelName())
                 .appendProperty("RESOURCE_MODEL", data.getResourceModelName())
                 .append("EXTENDS", CollectionModelFile.ABSTRACT_COLLECTION)
                 .append(
                         "RESOURCE_MODEL",
-                        resourceModelFile.getNamespaceBuilder(
-                                data.getModuleName()
-                        ).getClassFqn(),
+                        resourceModelFile.getClassFqn(),
                         ResourceModelFile.ALIAS
                 )
                 .append(
                         "MODEL",
-                        modelFile.getNamespaceBuilder(
-                                data.getModuleName()
-                        ).getClassFqn(),
+                        modelFile.getClassFqn(),
                         ModelFile.ALIAS
                 )
                 .mergeProperties(attributes);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java
index 1b6daac7d..736287dc4 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java
@@ -44,10 +44,10 @@ public ModuleComposerJsonGenerator(
     ) {
         super(project);
         this.moduleComposerJsonData = moduleComposerJsonData;
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.directoryGenerator = DirectoryGenerator.getInstance();
         this.camelCaseToHyphen = CamelCaseToHyphen.getInstance();
-        this.moduleIndex = ModuleIndex.getInstance(project);
+        this.moduleIndex = new ModuleIndex(project);
     }
 
     @Override
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleControllerClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleControllerClassGenerator.java
index 585369a52..e1fc2400d 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleControllerClassGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleControllerClassGenerator.java
@@ -57,7 +57,7 @@ public ModuleControllerClassGenerator(
         this.project = project;
         this.data = data;
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
@@ -146,7 +146,7 @@ private String getControllerFqn() {
     }
 
     private PhpClass createControllerClass(final String actionName) {
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(getControllerModule());
         final PsiFile controllerFile;
         final String[] controllerDirectories = data.getActionDirectory().split(
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplateHtmlGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplateHtmlGenerator.java
new file mode 100644
index 000000000..babb32fa7
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplateHtmlGenerator.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.generator;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiFile;
+import com.magento.idea.magento2plugin.actions.generation.data.EmailTemplateHtmlData;
+import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
+import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
+import com.magento.idea.magento2plugin.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.magento.files.EmailTemplateHtml;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
+import com.magento.idea.magento2plugin.magento.packages.Package;
+import com.magento.idea.magento2plugin.util.magento.FileBasedIndexUtil;
+import java.util.ArrayList;
+import java.util.Properties;
+
+public class ModuleEmailTemplateHtmlGenerator extends FileGenerator {
+    private final EmailTemplateHtmlData emailTemplateData;
+    private final FileFromTemplateGenerator fileFromTemplateGenerator;
+    private final ModuleIndex moduleIndex;
+    private final DirectoryGenerator directoryGenerator;
+    private final Project project;
+
+    /**
+     * Constructor.
+     *
+     * @param emailTemplateData EmailTemplateData
+     * @param project Project
+     */
+    public ModuleEmailTemplateHtmlGenerator(
+            final EmailTemplateHtmlData emailTemplateData,
+            final Project project
+    ) {
+        super(project);
+
+        this.emailTemplateData = emailTemplateData;
+        this.project = project;
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        this.directoryGenerator = DirectoryGenerator.getInstance();
+        this.moduleIndex = new ModuleIndex(project);
+    }
+
+    /**
+     * Generate email template HTML file.
+     *
+     * @param actionName Action name
+     * @return PsiFile
+     */
+    public PsiFile generate(final String actionName) {
+        final PsiFile templateFile = FileBasedIndexUtil.findModuleViewFile(
+                this.emailTemplateData.getFileName(),
+                getArea(this.emailTemplateData.getArea()),
+                this.emailTemplateData.getModule(),
+                this.project,
+                Package.moduleViewEmailDir
+        );
+
+        if (templateFile != null) {
+            return null;
+        }
+
+        PsiDirectory parentDirectory = this.moduleIndex.getModuleDirectoryByModuleName(
+                this.emailTemplateData.getModule()
+        );
+        final ArrayList<String> fileDirectories = new ArrayList<>();
+
+        fileDirectories.add(Package.moduleViewDir);
+        fileDirectories.add(this.emailTemplateData.getArea());
+        fileDirectories.add(Package.moduleViewEmailDir);
+
+        for (final String fileDirectory: fileDirectories) {
+            parentDirectory = this.directoryGenerator.findOrCreateSubdirectory(
+                    parentDirectory,
+                    fileDirectory
+            );
+        }
+        final EmailTemplateHtml emailTemplateHtml = EmailTemplateHtml.getInstance(
+                this.emailTemplateData.getFileName()
+        );
+
+        return fileFromTemplateGenerator.generate(
+                emailTemplateHtml,
+                getAttributes(),
+                parentDirectory,
+                actionName
+        );
+    }
+
+    @Override
+    protected void fillAttributes(final Properties attributes) {
+        attributes.setProperty("SUBJECT", emailTemplateData.getSubject());
+        attributes.setProperty("TYPE", emailTemplateData.getType());
+
+        if (emailTemplateData.getType().equals(EmailTemplateHtml.HTML_TYPE)) {
+            attributes.setProperty("HTML_TYPE", "true");
+        }
+    }
+
+    private Areas getArea(final String area) {
+        return Areas.getAreaByString(area);
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplatesXmlGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplatesXmlGenerator.java
new file mode 100644
index 000000000..5fce6a964
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplatesXmlGenerator.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.generator;
+
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.xml.XmlFile;
+import com.magento.idea.magento2plugin.actions.generation.data.EmailTemplatesXmlData;
+import com.magento.idea.magento2plugin.actions.generation.generator.util.FindOrCreateEmailTemplatesXml;
+import com.magento.idea.magento2plugin.actions.generation.generator.util.GetCodeTemplateUtil;
+import com.magento.idea.magento2plugin.actions.generation.generator.util.XmlFilePositionUtil;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
+import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
+import com.magento.idea.magento2plugin.magento.files.EmailTemplatesXml;
+import java.io.IOException;
+import java.util.Properties;
+import javax.swing.JOptionPane;
+
+@SuppressWarnings({"PMD.AvoidPrintStackTrace"})
+public class ModuleEmailTemplatesXmlGenerator extends FileGenerator {
+    private final EmailTemplatesXmlData emailTemplatesData;
+    private final Project project;
+    private final FindOrCreateEmailTemplatesXml findOrCreateEmailTemplatesXml;
+    private final GetCodeTemplateUtil getCodeTemplateUtil;
+    private final XmlFilePositionUtil positionUtil;
+    private final PsiDocumentManager psiDocumentManager;
+    private final CodeStyleManager codeStyleManager;
+    private final ValidatorBundle validatorBundle;
+    private final CommonBundle commonBundle;
+
+    /**
+     * Module email templates XML generator constructor.
+     *
+     * @param emailTemplatesData EmailTemplatesData
+     * @param project Project
+     */
+    public ModuleEmailTemplatesXmlGenerator(
+            final EmailTemplatesXmlData emailTemplatesData,
+            final Project project
+    ) {
+        super(project);
+        this.project = project;
+        this.emailTemplatesData = emailTemplatesData;
+        this.getCodeTemplateUtil = new GetCodeTemplateUtil(project);
+        this.findOrCreateEmailTemplatesXml = new FindOrCreateEmailTemplatesXml(project);
+        this.positionUtil = XmlFilePositionUtil.getInstance();
+        this.psiDocumentManager = PsiDocumentManager.getInstance(project);
+        this.codeStyleManager = CodeStyleManager.getInstance(project);
+        this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
+    }
+
+
+    /**
+     * Generate email template XML file.
+     *
+     * @param actionName Action name
+     * @return PsiFile
+     */
+    public PsiFile generate(final String actionName) {
+        final String moduleName = this.emailTemplatesData.getModule();
+        final XmlFile emailTemplateXmlFile = (XmlFile) this.findOrCreateEmailTemplatesXml.execute(
+                actionName,
+                moduleName
+        );
+
+        WriteCommandAction.runWriteCommandAction(project, () -> {
+            final StringBuffer textBuf = new StringBuffer();
+
+            try {
+                final String emailTemplateRegistrationTemplate = this.getCodeTemplateUtil.execute(
+                        EmailTemplatesXml.EMAIL_TEMPLATE_REGISTRATION,
+                        getAttributes()
+                );
+
+                textBuf.append(emailTemplateRegistrationTemplate);
+            } catch (final IOException exception) {
+                exception.printStackTrace();
+                return;
+            }
+
+            final int insertPos = this.positionUtil.getRootInsertPosition(emailTemplateXmlFile);
+
+            if (textBuf.length() > 0 && insertPos >= 0) {
+                final Document document = this.psiDocumentManager.getDocument(emailTemplateXmlFile);
+                final String filePath = emailTemplateXmlFile.getVirtualFile().getPath();
+
+                if (document == null) {
+                    // practically this should not be possible as we tell to edit XML file
+                    final String errorMessage = this.validatorBundle.message(
+                            "validator.file.noDocumentAssociations",
+                            filePath
+                    );
+                    JOptionPane.showMessageDialog(
+                            null,
+                            errorMessage,
+                            commonBundle.message("common.error"),
+                            JOptionPane.ERROR_MESSAGE
+                    );
+
+                    return;
+                }
+
+                if (!document.isWritable()) {
+                    final String errorMessage = this.validatorBundle.message(
+                            "validator.file.isNotWritable",
+                            filePath
+                    );
+                    JOptionPane.showMessageDialog(
+                            null,
+                            errorMessage,
+                            commonBundle.message("common.error"),
+                            JOptionPane.ERROR_MESSAGE
+                    );
+
+                    return;
+                }
+
+                document.insertString(insertPos, textBuf);
+                final int endPos = insertPos + textBuf.length() + 1;
+
+                this.codeStyleManager.reformatText(emailTemplateXmlFile, insertPos, endPos);
+                this.psiDocumentManager.commitDocument(document);
+            }
+        });
+
+        return emailTemplateXmlFile;
+    }
+
+    /**
+     * Fill attributes.
+     *
+     * @param attributes attributes
+     */
+    protected void fillAttributes(final Properties attributes) {
+        attributes.setProperty("ID", emailTemplatesData.getId());
+        attributes.setProperty("LABEL", emailTemplatesData.getLabel());
+        attributes.setProperty("FILE_NAME", emailTemplatesData.getTemplateFileName());
+        attributes.setProperty("TYPE", emailTemplatesData.getType());
+        attributes.setProperty("MODULE", emailTemplatesData.getModule());
+        attributes.setProperty("AREA", emailTemplatesData.getArea());
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleGraphQlResolverClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleGraphQlResolverClassGenerator.java
index 6592c984a..beb89cef1 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleGraphQlResolverClassGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleGraphQlResolverClassGenerator.java
@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
 import com.intellij.openapi.command.WriteCommandAction;
@@ -21,30 +22,39 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.actions.generation.util.CodeStyleSettings;
 import com.magento.idea.magento2plugin.bundles.CommonBundle;
+import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.magento.files.GraphQlResolverPhp;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.MagentoPhpClass;
 import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
-import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
-import org.jetbrains.annotations.NotNull;
-import javax.swing.*;
-import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.Properties;
+import javax.swing.JOptionPane;
+import org.jetbrains.annotations.NotNull;
 
 public class ModuleGraphQlResolverClassGenerator extends FileGenerator {
-    private GraphQlResolverFileData graphQlResolverFileData;
-    private Project project;
-    private ValidatorBundle validatorBundle;
-    private CommonBundle commonBundle;
+    private final GraphQlResolverFileData graphQlResolverFileData;
+    private final Project project;
+    private final ValidatorBundle validatorBundle;
+    private final CommonBundle commonBundle;
     private final DirectoryGenerator directoryGenerator;
     private final FileFromTemplateGenerator fileFromTemplateGenerator;
     private final GetFirstClassOfFile getFirstClassOfFile;
 
-    public ModuleGraphQlResolverClassGenerator(@NotNull GraphQlResolverFileData graphQlResolverFileData, Project project) {
+    /**
+     * Construct generator.
+     *
+     * @param graphQlResolverFileData GraphQlResolverFileData
+     * @param project Project
+     */
+    public ModuleGraphQlResolverClassGenerator(
+            final @NotNull GraphQlResolverFileData graphQlResolverFileData,
+            final Project project
+    ) {
         super(project);
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
         this.graphQlResolverFileData = graphQlResolverFileData;
         this.project = project;
@@ -53,17 +63,21 @@ public ModuleGraphQlResolverClassGenerator(@NotNull GraphQlResolverFileData grap
     }
 
     @Override
-    public PsiFile generate(String actionName) {
+    public PsiFile generate(final String actionName) {
         final PsiFile[] graphQlFile = {null};
         WriteCommandAction.runWriteCommandAction(project, () -> {
-            PhpClass graphQlResolverClass = GetPhpClassByFQN.getInstance(project).execute(graphQlResolverFileData.getGraphQlResolverClassFqn());
+            PhpClass graphQlResolverClass = GetPhpClassByFQN.getInstance(project)
+                    .execute(graphQlResolverFileData.getGraphQlResolverClassFqn());
 
             if (graphQlResolverClass == null) {
                 graphQlResolverClass = createGraphQlResolverClass(actionName);
             }
 
             if (graphQlResolverClass == null) {
-                String errorMessage = validatorBundle.message("validator.file.cantBeCreated", "GraphQL Resolver Class");
+                final String errorMessage = validatorBundle.message(
+                        "validator.file.cantBeCreated",
+                        "GraphQL Resolver Class"
+                );
                 JOptionPane.showMessageDialog(
                         null,
                         errorMessage,
@@ -74,19 +88,21 @@ public PsiFile generate(String actionName) {
                 return;
             }
 
-            Properties attributes = new Properties();
-            String methodTemplate = PhpCodeUtil.getCodeTemplate(
+            final Properties attributes = new Properties();
+            final String methodTemplate = PhpCodeUtil.getCodeTemplate(
                     GraphQlResolverPhp.GRAPHQL_RESOLVER_TEMPLATE_NAME, attributes, project);
 
             graphQlFile[0] = graphQlResolverClass.getContainingFile();
-            CodeStyleSettings codeStyleSettings = new CodeStyleSettings((PhpFile) graphQlFile[0]);
+            final CodeStyleSettings codeStyleSettings = new CodeStyleSettings(
+                    (PhpFile) graphQlFile[0]
+            );
             codeStyleSettings.adjustBeforeWrite();
 
-            PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
-            Document document = psiDocumentManager.getDocument(graphQlFile[0]);
-            int insertPos = getInsertPos(graphQlResolverClass);
+            final PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
+            final Document document = psiDocumentManager.getDocument(graphQlFile[0]);
+            final int insertPos = getInsertPos(graphQlResolverClass);
             document.insertString(insertPos, methodTemplate);
-            int endPos = insertPos + methodTemplate.length() + 1;
+            final int endPos = insertPos + methodTemplate.length() + 1;
             CodeStyleManager.getInstance(project).reformatText(graphQlFile[0], insertPos, endPos);
             psiDocumentManager.commitDocument(document);
             codeStyleSettings.restore();
@@ -94,10 +110,13 @@ public PsiFile generate(String actionName) {
         return graphQlFile[0];
     }
 
-    private int getInsertPos(PhpClass graphQlResolverClass) {
+    private int getInsertPos(final PhpClass graphQlResolverClass) {
         int insertPos = -1;
-        LeafPsiElement[] leafElements = PsiTreeUtil.getChildrenOfType(graphQlResolverClass, LeafPsiElement.class);
-        for (LeafPsiElement leafPsiElement: leafElements) {
+        final LeafPsiElement[] leafElements = PsiTreeUtil.getChildrenOfType(
+                graphQlResolverClass,
+                LeafPsiElement.class
+        );
+        for (final LeafPsiElement leafPsiElement: leafElements) {
             if (!leafPsiElement.getText().equals(MagentoPhpClass.CLOSING_TAG)) {
                 continue;
             }
@@ -106,17 +125,23 @@ private int getInsertPos(PhpClass graphQlResolverClass) {
         return insertPos;
     }
 
-    private PhpClass createGraphQlResolverClass(String actionName) {
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+    private PhpClass createGraphQlResolverClass(final String actionName) {
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(graphQlResolverFileData.getGraphQlResolverModule());
-        String[] graphQlResolverDirectories = graphQlResolverFileData.getGraphQlResolverDirectory().split(File.separator);
-        for (String graphQlResolverDirectory: graphQlResolverDirectories) {
-            parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, graphQlResolverDirectory);
+        final String[] graphQlResolverDirectories = graphQlResolverFileData
+                .getGraphQlResolverDirectory().split(File.separator);
+        for (final String graphQlResolverDirectory: graphQlResolverDirectories) {
+            parentDirectory = directoryGenerator.findOrCreateSubdirectory(
+                    parentDirectory,
+                    graphQlResolverDirectory
+            );
         }
 
-        Properties attributes = getAttributes();
-        PsiFile graphQlResolverFile = fileFromTemplateGenerator.generate(
-                GraphQlResolverPhp.getInstance(graphQlResolverFileData.getGraphQlResolverClassName()),
+        final Properties attributes = getAttributes();
+        final PsiFile graphQlResolverFile = fileFromTemplateGenerator.generate(
+                GraphQlResolverPhp.getInstance(
+                        graphQlResolverFileData.getGraphQlResolverClassName()
+                ),
                 attributes,
                 parentDirectory,
                 actionName
@@ -127,8 +152,10 @@ private PhpClass createGraphQlResolverClass(String actionName) {
         return getFirstClassOfFile.execute((PhpFile) graphQlResolverFile);
     }
 
-    protected void fillAttributes(Properties attributes) {
-        String graphQlResolverClassName = graphQlResolverFileData.getGraphQlResolverClassName();
+    @Override
+    protected void fillAttributes(final Properties attributes) {
+        final String graphQlResolverClassName
+                = graphQlResolverFileData.getGraphQlResolverClassName();
         attributes.setProperty("NAME", graphQlResolverClassName);
         attributes.setProperty("NAMESPACE", graphQlResolverFileData.getNamespace());
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleModelGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleModelGenerator.java
index 993f00198..e31252d08 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleModelGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleModelGenerator.java
@@ -5,37 +5,19 @@
 
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
-import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiFile;
-import com.jetbrains.php.lang.psi.PhpFile;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.actions.generation.data.ModelData;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassGeneratorUtil;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassTypesBuilder;
-import com.magento.idea.magento2plugin.bundles.CommonBundle;
-import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
-import com.magento.idea.magento2plugin.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
 import com.magento.idea.magento2plugin.magento.files.ModelFile;
 import com.magento.idea.magento2plugin.magento.files.ResourceModelFile;
-import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
-import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import java.util.Properties;
-import javax.swing.JOptionPane;
 import org.jetbrains.annotations.NotNull;
 
-public class ModuleModelGenerator extends FileGenerator {
+public class ModuleModelGenerator extends PhpFileGenerator {
+
     private final ModelData data;
-    private final Project project;
-    private final ValidatorBundle validatorBundle;
-    private final CommonBundle commonBundle;
-    private final GetFirstClassOfFile getFirstClassOfFile;
-    private final DirectoryGenerator directoryGenerator;
-    private final FileFromTemplateGenerator fileFromTemplateGenerator;
-    private final ModelFile file;
 
     /**
      * Generates new Model PHP Class based on provided data.
@@ -47,100 +29,28 @@ public ModuleModelGenerator(
             final @NotNull ModelData data,
             final @NotNull Project project
     ) {
-        super(project);
-        this.project = project;
-        this.data = data;
-        this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
-        this.validatorBundle = new ValidatorBundle();
-        this.commonBundle = new CommonBundle();
-        file = new ModelFile(data.getModelName());
+        this(data, project, true);
     }
 
     /**
-     * Generates model class.
-     *
-     * @param actionName Action name
+     * Generates new Model PHP Class based on provided data.
      *
-     * @return PsiFile
+     * @param data ModelData
+     * @param project Project
+     * @param checkFileAlreadyExists boolean
      */
-    @Override
-    public PsiFile generate(final @NotNull String actionName) {
-        final PsiFile[] modelFiles = new PsiFile[1];
-
-        WriteCommandAction.runWriteCommandAction(project, () -> {
-            PhpClass model = GetPhpClassByFQN.getInstance(project).execute(
-                    file.getNamespaceBuilder(data.getModuleName()).getClassFqn()
-            );
-
-            if (model != null) {
-                final String errorMessage = this.validatorBundle.message(
-                        "validator.file.alreadyExists",
-                        "Model Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
-                return;
-            }
-
-            model = createModelClass(actionName);
-
-            if (model == null) {
-                final String errorMessage = this.validatorBundle.message(
-                        "validator.file.cantBeCreated",
-                        "Model Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
-                return;
-            }
-
-            modelFiles[0] = model.getContainingFile();
-        });
-
-        return modelFiles[0];
+    public ModuleModelGenerator(
+            final @NotNull ModelData data,
+            final @NotNull Project project,
+            final boolean checkFileAlreadyExists
+    ) {
+        super(project, checkFileAlreadyExists);
+        this.data = data;
     }
 
-    /**
-     * Create model class.
-     *
-     * @param actionName String
-     *
-     * @return PhpClass
-     */
-    private PhpClass createModelClass(final @NotNull String actionName) {
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
-                .getModuleDirectoryByModuleName(data.getModuleName());
-        final PsiFile modelFile;
-
-        parentDirectory = directoryGenerator.findOrCreateSubdirectory(
-                parentDirectory, ModelFile.MODEL_DIRECTORY
-        );
-
-        final Properties attributes = getAttributes();
-        modelFile = fileFromTemplateGenerator.generate(
-                file,
-                attributes,
-                parentDirectory,
-                actionName
-        );
-
-        if (modelFile == null) {
-            return null;
-        }
-
-        return getFirstClassOfFile.execute((PhpFile) modelFile);
+    @Override
+    protected AbstractPhpFile initFile() {
+        return new ModelFile(data.getModuleName(), data.getModelName());
     }
 
     /**
@@ -151,18 +61,19 @@ private PhpClass createModelClass(final @NotNull String actionName) {
     @Override
     protected void fillAttributes(final @NotNull Properties attributes) {
         final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
-        final ResourceModelFile resourceModelFile = new ResourceModelFile(data.getResourceName());
+        final ResourceModelFile resourceModelFile =
+                new ResourceModelFile(data.getModuleName(), data.getResourceName());
 
         phpClassTypesBuilder
                 .appendProperty("NAME", data.getModelName())
                 .appendProperty(
                         "NAMESPACE",
-                        file.getNamespaceBuilder(data.getModuleName()).getNamespace()
+                        file.getNamespace()
                 )
                 .appendProperty("DB_NAME", data.getDbTableName())
                 .append(
                         "RESOURCE_MODEL",
-                        resourceModelFile.getNamespaceBuilder(data.getModuleName()).getClassFqn(),
+                        resourceModelFile.getClassFqn(),
                         ResourceModelFile.ALIAS
                 )
                 .appendProperty(
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleRegistrationPhpGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleRegistrationPhpGenerator.java
index 011093080..4cb029902 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleRegistrationPhpGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleRegistrationPhpGenerator.java
@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
 import com.intellij.openapi.project.Project;
@@ -11,8 +12,8 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.magento.files.RegistrationPhp;
-import org.jetbrains.annotations.NotNull;
 import java.util.Properties;
+import org.jetbrains.annotations.NotNull;
 
 public class ModuleRegistrationPhpGenerator extends FileGenerator {
 
@@ -20,22 +21,54 @@ public class ModuleRegistrationPhpGenerator extends FileGenerator {
     private final FileFromTemplateGenerator fileFromTemplateGenerator;
     private final DirectoryGenerator directoryGenerator;
 
-    public ModuleRegistrationPhpGenerator(@NotNull ModuleRegistrationPhpData moduleRegistrationPhpData, Project project) {
+    /**
+     * Construct generator.
+     *
+     * @param moduleRegistrationPhpData ModuleRegistrationPhpData
+     * @param project Project
+     */
+    public ModuleRegistrationPhpGenerator(
+            final @NotNull ModuleRegistrationPhpData moduleRegistrationPhpData,
+            final Project project
+    ) {
         super(project);
         this.moduleRegistrationPhpData = moduleRegistrationPhpData;
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.directoryGenerator = DirectoryGenerator.getInstance();
     }
 
-    public PsiFile generate(String actionName) {
+    /**
+     * Generate file.
+     *
+     * @param actionName String
+     * @return PsiFile
+     */
+    @Override
+    public PsiFile generate(final String actionName) {
         if (moduleRegistrationPhpData.getCreateModuleDirs()) {
-            ModuleDirectoriesData moduleDirectoriesData = directoryGenerator.createOrFindModuleDirectories(moduleRegistrationPhpData.getPackageName(), moduleRegistrationPhpData.getModuleName(), moduleRegistrationPhpData.getBaseDir());
-            return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleDirectoriesData.getModuleDirectory(), actionName);
+            final ModuleDirectoriesData moduleDirectoriesData = directoryGenerator
+                    .createOrFindModuleDirectories(
+                            moduleRegistrationPhpData.getPackageName(),
+                            moduleRegistrationPhpData.getModuleName(),
+                            moduleRegistrationPhpData.getBaseDir()
+                    );
+            return fileFromTemplateGenerator.generate(
+                    RegistrationPhp.getInstance(),
+                    getAttributes(),
+                    moduleDirectoriesData.getModuleDirectory(),
+                    actionName
+            );
         }
-        return fileFromTemplateGenerator.generate(RegistrationPhp.getInstance(), getAttributes(), moduleRegistrationPhpData.getBaseDir(), actionName);
+        return fileFromTemplateGenerator.generate(
+                RegistrationPhp.getInstance(),
+                getAttributes(),
+                moduleRegistrationPhpData.getBaseDir(),
+                actionName
+        );
     }
 
-    protected void fillAttributes(Properties attributes) {
+    @Override
+    protected void fillAttributes(final Properties attributes) {
         attributes.setProperty("PACKAGE", moduleRegistrationPhpData.getPackageName());
         attributes.setProperty("MODULE_NAME", moduleRegistrationPhpData.getModuleName());
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleResourceModelGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleResourceModelGenerator.java
index 4ff077f97..b885508a2 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleResourceModelGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleResourceModelGenerator.java
@@ -5,150 +5,52 @@
 
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
-import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiFile;
-import com.jetbrains.php.lang.psi.PhpFile;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.actions.generation.data.ResourceModelData;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassGeneratorUtil;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassTypesBuilder;
-import com.magento.idea.magento2plugin.bundles.CommonBundle;
-import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
-import com.magento.idea.magento2plugin.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
 import com.magento.idea.magento2plugin.magento.files.ResourceModelFile;
-import com.magento.idea.magento2plugin.magento.packages.File;
-import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
-import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import java.util.List;
 import java.util.Properties;
-import javax.swing.JOptionPane;
 import org.jetbrains.annotations.NotNull;
 
-public class ModuleResourceModelGenerator extends FileGenerator {
+public class ModuleResourceModelGenerator extends PhpFileGenerator {
 
-    private final ResourceModelData resourceModelData;
-    private final Project project;
-    private final ValidatorBundle validatorBundle;
-    private final CommonBundle commonBundle;
-    private final GetFirstClassOfFile getFirstClassOfFile;
-    private final DirectoryGenerator directoryGenerator;
-    private final FileFromTemplateGenerator fileFromTemplateGenerator;
-    private final ResourceModelFile file;
+    private final ResourceModelData data;
 
     /**
      * Generates new Resource Model PHP Class based on provided data.
      *
-     * @param resourceModelData ResourceModelData
+     * @param data ResourceModelData
      * @param project Project
      */
     public ModuleResourceModelGenerator(
-            final ResourceModelData resourceModelData,
+            final ResourceModelData data,
             final Project project
     ) {
-        super(project);
-        this.project = project;
-        this.resourceModelData = resourceModelData;
-        this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
-        this.validatorBundle = new ValidatorBundle();
-        this.commonBundle = new CommonBundle();
-        file = new ResourceModelFile(resourceModelData.getResourceModelName());
-
+        this(data, project, true);
     }
 
     /**
-     * Generates resource model class.
-     *
-     * @param actionName Action name
+     * Generates new Resource Model PHP Class based on provided data.
      *
-     * @return PsiFile
+     * @param data ResourceModelData
+     * @param project Project
+     * @param checkFileAlreadyExists boolean
      */
-    @Override
-    public PsiFile generate(final @NotNull String actionName) {
-        final PsiFile[] resourceModelFiles = new PsiFile[1];
-
-        WriteCommandAction.runWriteCommandAction(project, () -> {
-            PhpClass resourceModel = GetPhpClassByFQN.getInstance(project).execute(
-                    file.getNamespaceBuilder(resourceModelData.getModuleName()).getClassFqn()
-            );
-
-            if (resourceModel != null) {
-                final String errorMessage = this.validatorBundle.message(
-                        "validator.file.alreadyExists",
-                        "Resource Model Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
-                return;
-            }
-
-            resourceModel = createClass(actionName);
-
-            if (resourceModel == null) {
-                final String errorMessage = this.validatorBundle.message(
-                        "validator.file.cantBeCreated",
-                        "Resource Model Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
-                return;
-            }
-
-            resourceModelFiles[0] = resourceModel.getContainingFile();
-        });
-
-        return resourceModelFiles[0];
+    public ModuleResourceModelGenerator(
+            final ResourceModelData data,
+            final Project project,
+            final boolean checkFileAlreadyExists
+    ) {
+        super(project, checkFileAlreadyExists);
+        this.data = data;
     }
 
-    /**
-     * Create resource model class.
-     *
-     * @param actionName String
-     *
-     * @return PhpClass
-     */
-    private PhpClass createClass(final @NotNull String actionName) {
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
-                .getModuleDirectoryByModuleName(resourceModelData.getModuleName());
-        final PsiFile modelFile;
-
-        final String[] resourceModelDirectories = ResourceModelFile.RESOURCE_MODEL_DIRECTORY.split(
-            File.separator
-        );
-        for (final String directory: resourceModelDirectories) {
-            parentDirectory = directoryGenerator.findOrCreateSubdirectory(
-                parentDirectory, directory
-            );
-        }
-
-        final Properties attributes = getAttributes();
-        modelFile = fileFromTemplateGenerator.generate(
-                file,
-                attributes,
-                parentDirectory,
-                actionName
-        );
-
-        if (modelFile == null) {
-            return null;
-        }
-
-        return getFirstClassOfFile.execute((PhpFile) modelFile);
+    @Override
+    protected AbstractPhpFile initFile() {
+        return new ResourceModelFile(data.getModuleName(), data.getResourceModelName());
     }
 
     /**
@@ -161,13 +63,13 @@ protected void fillAttributes(final @NotNull Properties attributes) {
         final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
 
         phpClassTypesBuilder
-                .appendProperty("NAME", resourceModelData.getResourceModelName())
+                .appendProperty("NAME", data.getResourceModelName())
                 .appendProperty(
                         "NAMESPACE",
-                        file.getNamespaceBuilder(resourceModelData.getModuleName()).getNamespace()
+                        file.getNamespace()
                 )
-                .appendProperty("DB_NAME", resourceModelData.getDbTableName())
-                .appendProperty("ENTITY_ID_COLUMN", resourceModelData.getEntityIdColumn())
+                .appendProperty("DB_NAME", data.getDbTableName())
+                .appendProperty("ENTITY_ID_COLUMN", data.getEntityIdColumn())
                 .append("EXTENDS", ResourceModelFile.ABSTRACT_DB)
                 .mergeProperties(attributes);
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleViewModelClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleViewModelClassGenerator.java
index 05847e1f9..a83ba7724 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleViewModelClassGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleViewModelClassGenerator.java
@@ -45,7 +45,7 @@ public ModuleViewModelClassGenerator(
         super(project);
 
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.viewModelFileData = viewModelFileData;
         this.project = project;
         this.validatorBundle = new ValidatorBundle();
@@ -104,7 +104,7 @@ private String getViewModelFqn() {
     }
 
     private PhpFile createViewModelClass(final String actionName) {
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(getViewModelModule());
         final String[] viewModelDirectories = viewModelFileData.getViewModelDirectory()
                 .split(File.separator);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java
index d072796b3..311250111 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGenerator.java
@@ -14,6 +14,7 @@
 import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.magento.files.ModuleXml;
 import com.magento.idea.magento2plugin.magento.packages.Package;
+import java.util.List;
 import java.util.Properties;
 import org.jetbrains.annotations.NotNull;
 
@@ -35,7 +36,7 @@ public ModuleXmlGenerator(
     ) {
         super(project);
         this.moduleXmlData = moduleXmlData;
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.directoryGenerator = DirectoryGenerator.getInstance();
     }
 
@@ -74,5 +75,30 @@ protected void fillAttributes(final Properties attributes) {
         if (moduleXmlData.getSetupVersion() != null) {
             attributes.setProperty("SETUP_VERSION", moduleXmlData.getSetupVersion());
         }
+
+        final String sequences = this.getSequencesString(moduleXmlData.getModuleSequences());
+        if (!sequences.isEmpty()) {
+            attributes.setProperty(
+                    "SEQUENCES",
+                    sequences
+            );
+        }
+    }
+
+    private String getSequencesString(final List sequences) {
+        String result = "";
+        final Object[] dependencies = sequences.toArray();
+        final boolean noDependency = dependencies.length == 1 && dependencies[0]
+                .equals(ModuleXml.NO_SEQUENCES_LABEL);
+
+        if (noDependency) {
+            return result;
+        }
+
+        for (final Object o : dependencies) {
+            result = result.concat(String.format("<module name=\"%s\"/>", o.toString()));
+        }
+
+        return result;
     }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityControllerFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityControllerFileGenerator.java
index b67c7b52e..21444054d 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityControllerFileGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityControllerFileGenerator.java
@@ -6,104 +6,74 @@
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiFile;
 import com.magento.idea.magento2plugin.actions.generation.data.NewActionEntityControllerFileData;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassGeneratorUtil;
-import com.magento.idea.magento2plugin.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassTypesBuilder;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
 import com.magento.idea.magento2plugin.magento.files.actions.NewActionFile;
 import com.magento.idea.magento2plugin.magento.packages.HttpMethod;
 import com.magento.idea.magento2plugin.magento.packages.code.BackendModuleType;
 import com.magento.idea.magento2plugin.magento.packages.code.FrameworkLibraryType;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
+import org.jetbrains.annotations.NotNull;
 
-public class NewActionEntityControllerFileGenerator extends FileGenerator {
+public class NewActionEntityControllerFileGenerator extends PhpFileGenerator {
 
-    private final NewActionEntityControllerFileData fileData;
-    private final FileFromTemplateGenerator fileFromTemplateGenerator;
-    private final DirectoryGenerator directoryGenerator;
-    private final ModuleIndex moduleIndex;
-    private final List<String> uses;
+    private final NewActionEntityControllerFileData data;
 
     /**
      * NewAction Entity Controller File Generator.
-     * @param fileData NewActionEntityControllerFileData
+     *
+     * @param data NewActionEntityControllerFileData
      * @param project Project
      */
     public NewActionEntityControllerFileGenerator(
-            final NewActionEntityControllerFileData fileData,
+            final NewActionEntityControllerFileData data,
             final @NotNull Project project
     ) {
-        super(project);
-        this.fileData = fileData;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        moduleIndex = ModuleIndex.getInstance(project);
-        directoryGenerator = DirectoryGenerator.getInstance();
-        uses = new ArrayList<>();
+        super(project, true);
+        this.data = data;
     }
 
     /**
-     * Generate NewAction controller for entity.
-     *
-     * @param actionName String
+     * NewAction Entity Controller File Generator.
      *
-     * @return PsiFile
+     * @param data NewActionEntityControllerFileData
+     * @param project Project
+     * @param checkFileAlreadyExists boolean
      */
-    @Override
-    public PsiFile generate(final @NotNull String actionName) {
-        final PsiDirectory moduleBaseDir = moduleIndex.getModuleDirectoryByModuleName(
-                fileData.getModuleName()
-        );
-        final PsiDirectory baseDirectory = directoryGenerator.findOrCreateSubdirectories(
-                moduleBaseDir,
-                NewActionFile.getDirectory(fileData.getEntityName())
-        );
+    public NewActionEntityControllerFileGenerator(
+            final NewActionEntityControllerFileData data,
+            final @NotNull Project project,
+            final boolean checkFileAlreadyExists
+    ) {
+        super(project, checkFileAlreadyExists);
+        this.data = data;
+    }
 
-        return fileFromTemplateGenerator.generate(
-                NewActionFile.getInstance(),
-                getAttributes(),
-                baseDirectory,
-                actionName
-        );
+    @Override
+    protected AbstractPhpFile initFile() {
+        return new NewActionFile(data.getModuleName(), data.getEntityName());
     }
 
     @Override
     protected void fillAttributes(final @NotNull Properties attributes) {
-        attributes.setProperty("NAMESPACE", fileData.getNamespace());
-        attributes.setProperty("ENTITY_NAME", fileData.getEntityName());
-        attributes.setProperty("CLASS_NAME", NewActionFile.CLASS_NAME);
-        addProperty(attributes, "EXTENDS", BackendModuleType.EXTENDS.getType());
-        addProperty(attributes, "IMPLEMENTS", HttpMethod.GET.getInterfaceFqn());
-        attributes.setProperty("ADMIN_RESOURCE", fileData.getAcl());
-        attributes.setProperty("MENU_IDENTIFIER", fileData.getMenu());
-        addProperty(attributes, "RESULT_INTERFACE",
-                FrameworkLibraryType.RESULT_INTERFACE.getType()
-        );
-        addProperty(attributes, "RESULT_FACTORY", FrameworkLibraryType.RESULT_FACTORY.getType());
-        addProperty(attributes, "RESULT_PAGE", BackendModuleType.RESULT_PAGE.getType());
+        final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
 
-        attributes.setProperty("USES", PhpClassGeneratorUtil.formatUses(uses));
-    }
+        phpClassTypesBuilder
+                .appendProperty("NAMESPACE", data.getNamespace())
+                .appendProperty("ENTITY_NAME", data.getEntityName())
+                .appendProperty("CLASS_NAME", file.getClassName())
+                .appendProperty("ADMIN_RESOURCE", data.getAcl())
+                .appendProperty("MENU_IDENTIFIER", data.getMenu())
+                .append("EXTENDS", BackendModuleType.EXTENDS.getType())
+                .append("IMPLEMENTS", HttpMethod.GET.getInterfaceFqn())
+                .append("RESULT_INTERFACE", FrameworkLibraryType.RESULT_INTERFACE.getType())
+                .append("RESULT_FACTORY", FrameworkLibraryType.RESULT_FACTORY.getType())
+                .append("RESULT_PAGE", BackendModuleType.RESULT_PAGE.getType())
+                .mergeProperties(attributes);
 
-    /**
-     * Add type to properties.
-     *
-     * @param properties Properties
-     * @param propertyName String
-     * @param type String
-     */
-    protected void addProperty(
-            final @NotNull Properties properties,
-            final String propertyName,
-            final String type
-    ) {
-        uses.add(type);
-        properties.setProperty(propertyName, PhpClassGeneratorUtil.getNameFromFqn(type));
+        attributes.setProperty("USES",
+                PhpClassGeneratorUtil.formatUses(phpClassTypesBuilder.getUses()));
     }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/NewEntityLayoutGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/NewEntityLayoutGenerator.java
index c41360581..4587a05d2 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/NewEntityLayoutGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/NewEntityLayoutGenerator.java
@@ -59,9 +59,9 @@ public NewEntityLayoutGenerator(
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         file = new NewEntityLayoutFile(data.getNewActionPath().replace(File.separator, "_"));
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
     }
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ObserverClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ObserverClassGenerator.java
index d6abbe72e..da453a7a7 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/ObserverClassGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/ObserverClassGenerator.java
@@ -56,7 +56,7 @@ public ObserverClassGenerator(
         this.project = project;
 
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
@@ -131,7 +131,7 @@ private int getInsertPos(final PhpClass observerClass) {
     }
 
     private PhpClass createObserverClass(final String actionName) {
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(observerFileData.getObserverModule());
         final String[] observerDirectories = observerFileData.getObserverDirectory()
                 .split(File.separator);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java
index a8b6c8506..4be05b573 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java
@@ -67,7 +67,7 @@ public void execute(final PsiFile baseFile, final String themeName, final boolea
             return;
         }
 
-        final ModuleIndex moduleIndex = ModuleIndex.getInstance(project);
+        final ModuleIndex moduleIndex = new ModuleIndex(project);
         PsiDirectory directory = moduleIndex.getModuleDirectoryByModuleName(themeName);
         directory = getTargetDirectory(directory, pathComponents);
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/PhpFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/PhpFileGenerator.java
new file mode 100644
index 000000000..e3b81f08c
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/PhpFileGenerator.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.generator;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiFile;
+import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
+import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
+import com.magento.idea.magento2plugin.bundles.CommonBundle;
+import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
+import com.magento.idea.magento2plugin.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
+import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
+import javax.swing.JOptionPane;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class PhpFileGenerator extends FileGenerator {
+
+    protected AbstractPhpFile file;
+    private final ValidatorBundle validatorBundle;
+    private final CommonBundle commonBundle;
+    private final FileFromTemplateGenerator fileFromTemplateGenerator;
+    private final DirectoryGenerator directoryGenerator;
+    private final ModuleIndex moduleIndex;
+    private final boolean checkFileAlreadyExists;
+
+    /**
+     * Php file generator constructor.
+     *
+     * @param project Project
+     * @param checkFileAlreadyExists boolean
+     */
+    public PhpFileGenerator(
+            final @NotNull Project project,
+            final boolean checkFileAlreadyExists
+    ) {
+        super(project);
+        this.checkFileAlreadyExists = checkFileAlreadyExists;
+        this.validatorBundle = new ValidatorBundle();
+        this.commonBundle = new CommonBundle();
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        directoryGenerator = DirectoryGenerator.getInstance();
+        moduleIndex = new ModuleIndex(project);
+    }
+
+    /**
+     * Php file generation.
+     *
+     * @param actionName String
+     *
+     * @return PsiFile
+     */
+    @Override
+    public PsiFile generate(final @NotNull String actionName) {
+        file = getFile();
+
+        final PhpClass phpClass = GetPhpClassByFQN.getInstance(project).execute(
+                file.getClassFqn()
+        );
+
+        if (this.checkFileAlreadyExists && phpClass != null) {
+            onClassAlreadyExists(phpClass);
+
+            return phpClass.getContainingFile();
+        }
+
+        final PsiDirectory fileBaseDir = directoryGenerator.findOrCreateSubdirectories(
+                moduleIndex.getModuleDirectoryByModuleName(file.getModuleName()),
+                file.getDirectory()
+        );
+
+        final PsiFile generatedFile = fileFromTemplateGenerator.generate(
+                file,
+                getAttributes(),
+                fileBaseDir,
+                actionName
+        );
+        onFileGenerated(generatedFile);
+
+        return generatedFile;
+    }
+
+    /**
+     * Class already exists behaviour.
+     *
+     * @param phpClass PhpClass
+     */
+    @SuppressWarnings("PMD.UnusedFormalParameter")
+    protected void onClassAlreadyExists(final @NotNull PhpClass phpClass) {
+        JOptionPane.showMessageDialog(
+                null,
+                this.validatorBundle.message(
+                        "validator.file.alreadyExists",
+                        file.getHumanReadableName() == null
+                                ? file.getClassName() : file.getHumanReadableName()
+                ),
+                commonBundle.message("common.error"),
+                JOptionPane.ERROR_MESSAGE
+        );
+    }
+
+    /**
+     * Implement this method to add on file has been generated behaviour.
+     *
+     * @param generatedFile PsiFile
+     */
+    protected void onFileGenerated(final PsiFile generatedFile) {
+        if (generatedFile == null) {
+            JOptionPane.showMessageDialog(
+                    null,
+                    this.validatorBundle.message(
+                            "validator.file.cantBeCreated",
+                            file.getHumanReadableName() == null
+                                    ? file.getClassName() : file.getHumanReadableName()
+                    ),
+                    commonBundle.message("common.error"),
+                    JOptionPane.ERROR_MESSAGE
+            );
+        }
+    }
+
+    /**
+     * Initialize corresponding php file.
+     *
+     * @return AbstractPhpFile
+     */
+    protected abstract AbstractPhpFile initFile();
+
+    /**
+     * Get file object.
+     *
+     * @return AbstractPhpFile
+     */
+    protected AbstractPhpFile getFile() {
+        if (file == null) {
+            file = initFile();
+        }
+
+        return file;
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/PluginClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/PluginClassGenerator.java
index eb262867c..cb80c4fdd 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/PluginClassGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/PluginClassGenerator.java
@@ -72,7 +72,7 @@ public PluginClassGenerator(
     ) {
         super(project);
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
         this.fillTextBuffer = FillTextBufferWithPluginMethods.getInstance();
         this.collectInsertedMethods = CollectInsertedMethods.getInstance();
@@ -203,7 +203,7 @@ private boolean checkIfMethodExist(
     }
 
     private PhpClass createPluginClass(final String actionName) {
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(getPluginModule());
         final String[] pluginDirectories = pluginFileData.getPluginDirectory()
                 .split(File.separator);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGenerator.java
index d675dc85b..9e8c2f0c6 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGenerator.java
@@ -42,7 +42,7 @@ public PreferenceClassGenerator(
     ) {
         super(project);
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
         this.preferenceFileData = preferenceFileData;
         this.project = project;
@@ -80,7 +80,7 @@ public PsiFile generate(final String actionName) {
     }
 
     private PhpClass createPluginClass(final String actionName) {
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(getPreferenceModule());
         final String[] pluginDirectories = preferenceFileData.getPreferenceDirectory()
                 .split(File.separator);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/QueryGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/QueryGenerator.java
index b5cbcbd62..1fd09ef21 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/QueryGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/QueryGenerator.java
@@ -51,13 +51,13 @@ public QueryGenerator(
         super(project);
         this.data = data;
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         this.validatorBundle = new ValidatorBundle();
         this.commonBundle = new CommonBundle();
         this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
         this.project = project;
         this.moduleName = moduleName;
-        file = new UiComponentDataProviderFile(data.getName());
+        file = new UiComponentDataProviderFile(moduleName, data.getName(), data.getPath());
     }
 
     @Override
@@ -66,7 +66,7 @@ public PsiFile generate(final @NotNull String actionName) {
 
         WriteCommandAction.runWriteCommandAction(project, () -> {
             PhpClass dataProvider = GetPhpClassByFQN.getInstance(project).execute(
-                    file.getNamespaceBuilder(moduleName, data.getPath()).getClassFqn()
+                    file.getClassFqn()
             );
 
             if (dataProvider != null) {
@@ -115,13 +115,13 @@ public PsiFile generate(final @NotNull String actionName) {
      * @return PhpClass
      */
     private PhpClass createDataProviderClass(final @NotNull String actionName) {
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        final PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(this.moduleName);
         final PsiDirectory dataProviderDirectory =
                 directoryGenerator.findOrCreateSubdirectories(parentDirectory, data.getPath());
 
         final PsiFile dataProviderFile = fileFromTemplateGenerator.generate(
-                new UiComponentDataProviderFile(data.getName()),
+                new UiComponentDataProviderFile(moduleName, data.getName(), data.getPath()),
                 getAttributes(),
                 dataProviderDirectory,
                 actionName
@@ -141,8 +141,7 @@ private PhpClass createDataProviderClass(final @NotNull String actionName) {
      */
     @Override
     protected void fillAttributes(final @NotNull Properties attributes) {
-        attributes.setProperty("NAMESPACE",
-                file.getNamespaceBuilder(moduleName, data.getPath()).getNamespace());
+        attributes.setProperty("NAMESPACE", file.getNamespace());
         attributes.setProperty("CLASS_NAME", data.getName());
     }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityCommandGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityCommandGenerator.java
index 4246864c1..30241bfcb 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityCommandGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityCommandGenerator.java
@@ -7,15 +7,10 @@
 
 import com.google.common.base.CaseFormat;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiFile;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.actions.generation.data.SaveEntityCommandData;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassGeneratorUtil;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassTypesBuilder;
-import com.magento.idea.magento2plugin.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
 import com.magento.idea.magento2plugin.magento.files.DataModelFile;
 import com.magento.idea.magento2plugin.magento.files.DataModelInterfaceFile;
 import com.magento.idea.magento2plugin.magento.files.ModelFile;
@@ -23,19 +18,12 @@
 import com.magento.idea.magento2plugin.magento.files.commands.SaveEntityCommandFile;
 import com.magento.idea.magento2plugin.magento.packages.code.ExceptionType;
 import com.magento.idea.magento2plugin.magento.packages.code.FrameworkLibraryType;
-import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import java.util.Properties;
 import org.jetbrains.annotations.NotNull;
 
-public class SaveEntityCommandGenerator extends FileGenerator {
+public class SaveEntityCommandGenerator extends PhpFileGenerator {
 
-    private final Project project;
     private final SaveEntityCommandData data;
-    private final FileFromTemplateGenerator fileFromTemplateGenerator;
-    private final DirectoryGenerator directoryGenerator;
-    private final ModuleIndex moduleIndex;
-    private final boolean checkFileAlreadyExists;
-    private final SaveEntityCommandFile file;
 
     /**
      * Save entity command generator constructor.
@@ -62,47 +50,13 @@ public SaveEntityCommandGenerator(
             final @NotNull Project project,
             final boolean checkFileAlreadyExists
     ) {
-        super(project);
+        super(project, checkFileAlreadyExists);
         this.data = data;
-        this.project = project;
-        this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
-        file = new SaveEntityCommandFile(data.getEntityName());
     }
 
-    /**
-     * Generate save command for entity.
-     *
-     * @param actionName String
-     *
-     * @return PsiFile
-     */
     @Override
-    public PsiFile generate(final @NotNull String actionName) {
-        final PhpClass saveEntityCommandClass = GetPhpClassByFQN.getInstance(project).execute(
-                file.getClassFqn(data.getModuleName())
-        );
-
-        if (this.checkFileAlreadyExists && saveEntityCommandClass != null) {
-            return saveEntityCommandClass.getContainingFile();
-        }
-
-        final PsiDirectory moduleBaseDir = moduleIndex.getModuleDirectoryByModuleName(
-                data.getModuleName()
-        );
-        final PsiDirectory saveCommandFileBaseDir = directoryGenerator.findOrCreateSubdirectories(
-                moduleBaseDir,
-                file.getDirectory()
-        );
-
-        return fileFromTemplateGenerator.generate(
-                file,
-                getAttributes(),
-                saveCommandFileBaseDir,
-                actionName
-        );
+    protected AbstractPhpFile initFile() {
+        return new SaveEntityCommandFile(data.getModuleName(), data.getEntityName());
     }
 
     /**
@@ -115,7 +69,7 @@ protected void fillAttributes(final @NotNull Properties attributes) {
         final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
 
         phpClassTypesBuilder
-                .appendProperty("NAMESPACE", file.getNamespace(data.getModuleName()))
+                .appendProperty("NAMESPACE", file.getNamespace())
                 .appendProperty("ENTITY_NAME", data.getEntityName())
                 .appendProperty("CLASS_NAME", SaveEntityCommandFile.CLASS_NAME)
                 .append("EXCEPTION", "Exception")
@@ -123,14 +77,13 @@ protected void fillAttributes(final @NotNull Properties attributes) {
                 .append("COULD_NOT_SAVE", ExceptionType.COULD_NOT_SAVE.getType())
                 .append("LOGGER", FrameworkLibraryType.LOGGER.getType());
 
-        final ModelFile modelFile = new ModelFile(data.getModelName());
+        final ModelFile modelFile = new ModelFile(data.getModuleName(), data.getModelName());
         final ResourceModelFile resourceModelFile =
-                new ResourceModelFile(data.getResourceModelName());
+                new ResourceModelFile(data.getModuleName(), data.getResourceModelName());
 
-        final String modelType = modelFile.getNamespaceBuilder(data.getModuleName()).getClassFqn();
+        final String modelType = modelFile.getClassFqn();
         final String modelFactoryType = modelType.concat("Factory");
-        final String resourceType = resourceModelFile
-                .getNamespaceBuilder(data.getModuleName()).getClassFqn();
+        final String resourceType = resourceModelFile.getClassFqn();
 
         if (data.isDtoWithInterface()) {
             final DataModelInterfaceFile dataModelInterfaceFile =
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityControllerFileGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityControllerFileGenerator.java
index 4b695c8ff..2206ae358 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityControllerFileGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityControllerFileGenerator.java
@@ -65,8 +65,8 @@ public SaveEntityControllerFileGenerator(
         this.data = data;
         this.project = project;
         this.checkFileAlreadyExists = checkFileAlreadyExists;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        moduleIndex = ModuleIndex.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        moduleIndex = new ModuleIndex(project);
         directoryGenerator = DirectoryGenerator.getInstance();
         file = new SaveActionFile(data.getEntityName());
     }
@@ -138,8 +138,9 @@ protected void fillAttributes(final @NotNull Properties attributes) {
                 .append("ENTITY_DTO_FACTORY", dtoType.concat("Factory"))
                 .append("SAVE_COMMAND",
                         new SaveEntityCommandFile(
+                                data.getModuleName(),
                                 data.getEntityName()
-                        ).getClassFqn(data.getModuleName())
+                        ).getClassFqn()
                 )
                 .append("DATA_OBJECT", FrameworkLibraryType.DATA_OBJECT.getType())
                 .append("COULD_NOT_SAVE", SaveActionFile.COULD_NOT_SAVE)
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentDataProviderGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentDataProviderGenerator.java
index c73c76e36..e16c10cc5 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentDataProviderGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentDataProviderGenerator.java
@@ -5,40 +5,21 @@
 
 package com.magento.idea.magento2plugin.actions.generation.generator;
 
-import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiFile;
-import com.jetbrains.php.lang.psi.PhpFile;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.actions.generation.data.UiComponentDataProviderData;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassGeneratorUtil;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.PhpClassTypesBuilder;
-import com.magento.idea.magento2plugin.bundles.CommonBundle;
-import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
-import com.magento.idea.magento2plugin.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
 import com.magento.idea.magento2plugin.magento.files.UiComponentDataProviderFile;
 import com.magento.idea.magento2plugin.magento.files.queries.GetListQueryFile;
 import com.magento.idea.magento2plugin.magento.packages.code.FrameworkLibraryType;
-import com.magento.idea.magento2plugin.util.GetFirstClassOfFile;
-import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import java.util.Properties;
-import javax.swing.JOptionPane;
 import org.jetbrains.annotations.NotNull;
 
-public class UiComponentDataProviderGenerator extends FileGenerator {
+public class UiComponentDataProviderGenerator extends PhpFileGenerator {
 
     private final UiComponentDataProviderData data;
-    private final Project project;
-    private final DirectoryGenerator directoryGenerator;
-    private final FileFromTemplateGenerator fileFromTemplateGenerator;
-    private final ValidatorBundle validatorBundle;
-    private final CommonBundle commonBundle;
     private final String moduleName;
-    private final GetFirstClassOfFile getFirstClassOfFile;
-    private final UiComponentDataProviderFile file;
 
     /**
      * Ui component grid data provider constructor.
@@ -52,97 +33,31 @@ public UiComponentDataProviderGenerator(
             final @NotNull String moduleName,
             final @NotNull Project project
     ) {
-        super(project);
-        this.data = data;
-        this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        this.validatorBundle = new ValidatorBundle();
-        this.commonBundle = new CommonBundle();
-        this.getFirstClassOfFile = GetFirstClassOfFile.getInstance();
-        this.project = project;
-        this.moduleName = moduleName;
-        file = new UiComponentDataProviderFile(data.getName());
+        this(data, moduleName, project, true);
     }
 
     /**
-     * Generate UiComponent data provider class.
-     *
-     * @param actionName String
+     * Ui component grid data provider constructor.
      *
-     * @return PsiFile
+     * @param data UiComponentGridDataProviderData
+     * @param moduleName String
+     * @param project Project
+     * @param checkFileAlreadyExists boolean
      */
-    @Override
-    public PsiFile generate(final @NotNull String actionName) {
-        final PsiFile[] dataProviderFiles = new PsiFile[1];
-
-        WriteCommandAction.runWriteCommandAction(project, () -> {
-            PhpClass dataProvider = GetPhpClassByFQN.getInstance(project).execute(
-                    file.getNamespaceBuilder(moduleName, data.getPath()).getClassFqn()
-            );
-
-            if (dataProvider != null) {
-                final String errorMessage = this.validatorBundle.message(
-                        "validator.file.alreadyExists",
-                        "DataProvider Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
-                return;
-            }
-
-            dataProvider = createDataProviderClass(actionName);
-
-            if (dataProvider == null) {
-                final String errorMessage = this.validatorBundle.message(
-                        "validator.file.cantBeCreated",
-                        "DataProvider Class"
-                );
-                JOptionPane.showMessageDialog(
-                        null,
-                        errorMessage,
-                        commonBundle.message("common.error"),
-                        JOptionPane.ERROR_MESSAGE
-                );
-
-                return;
-            }
-
-            dataProviderFiles[0] = dataProvider.getContainingFile();
-        });
-
-        return dataProviderFiles[0];
+    public UiComponentDataProviderGenerator(
+            final @NotNull UiComponentDataProviderData data,
+            final @NotNull String moduleName,
+            final @NotNull Project project,
+            final boolean checkFileAlreadyExists
+    ) {
+        super(project, checkFileAlreadyExists);
+        this.data = data;
+        this.moduleName = moduleName;
     }
 
-    /**
-     * Generate data provider class.
-     *
-     * @param actionName String
-     *
-     * @return PhpClass
-     */
-    private PhpClass createDataProviderClass(final @NotNull String actionName) {
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
-                .getModuleDirectoryByModuleName(this.moduleName);
-        final PsiDirectory fileDirectory =
-                directoryGenerator.findOrCreateSubdirectories(parentDirectory, data.getPath());
-
-        final PsiFile dataProviderFile = fileFromTemplateGenerator.generate(
-                file,
-                getAttributes(),
-                fileDirectory,
-                actionName
-        );
-
-        if (dataProviderFile == null) {
-            return null;
-        }
-
-        return getFirstClassOfFile.execute((PhpFile) dataProviderFile);
+    @Override
+    protected AbstractPhpFile initFile() {
+        return new UiComponentDataProviderFile(moduleName, data.getName(), data.getPath());
     }
 
     /**
@@ -155,8 +70,7 @@ protected void fillAttributes(final @NotNull Properties attributes) {
         final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
 
         phpClassTypesBuilder
-                .appendProperty("NAMESPACE",
-                        file.getNamespaceBuilder(moduleName, data.getPath()).getNamespace())
+                .appendProperty("NAMESPACE", file.getNamespace())
                 .appendProperty("CLASS_NAME", data.getName())
                 .appendProperty("HAS_GET_LIST_QUERY", "false")
                 .append("EXTENDS", UiComponentDataProviderFile.DEFAULT_DATA_PROVIDER);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormButtonBlockGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormButtonBlockGenerator.java
index d4cbe6ecd..9fdd5347c 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormButtonBlockGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormButtonBlockGenerator.java
@@ -93,9 +93,9 @@ public UiComponentFormButtonBlockGenerator(
         this.checkFileAlreadyExists = checkFileAlreadyExists;
         this.entityName = entityName;
         this.entityIdField = entityIdField;
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
         uses = new ArrayList<>();
     }
 
@@ -124,7 +124,11 @@ public PsiFile generate(final @NotNull String actionName) {
         );
 
         return fileFromTemplateGenerator.generate(
-                new FormButtonBlockFile(buttonData.getButtonClassName()),
+                new FormButtonBlockFile(
+                        buttonData.getButtonModule(),
+                        buttonData.getButtonClassName(),
+                        buttonData.getButtonDirectory()
+                ),
                 getAttributes(),
                 baseDirectory,
                 actionName
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGenerator.java
index 9379f111b..5a5d3e5cb 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentFormGenerator.java
@@ -94,10 +94,10 @@ protected PsiFile createForm(
     ) {
         final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
         final FileFromTemplateGenerator fileFromTemplateGenerator =
-                FileFromTemplateGenerator.getInstance(project);
+                new FileFromTemplateGenerator(project);
 
         final String moduleName = data.getModuleName();
-        final PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        final PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
 
         final ArrayList<String> fileDirectories = new ArrayList<>();
@@ -114,11 +114,12 @@ protected PsiFile createForm(
 
         final String formName = data.getFormName();
         final UiComponentFormXmlFile uiComponentFormXml = new UiComponentFormXmlFile(formName);
-        XmlFile formFile = (XmlFile) FileBasedIndexUtil.findModuleConfigFile(
+        XmlFile formFile = (XmlFile) FileBasedIndexUtil.findModuleViewFile(
                 uiComponentFormXml.getFileName(),
                 getArea(area),
-                formName,
-                project
+                moduleName,
+                project,
+                Package.moduleViewUiComponentDir
         );
 
         if (formFile == null) {
@@ -129,7 +130,10 @@ protected PsiFile createForm(
                     actionName
             );
         }
-        new XmlDeclarationsGenerator(data, project).generate(formFile);
+
+        if (formFile != null) {
+            new XmlDeclarationsGenerator(data, project).generate(formFile);
+        }
 
         return formFile;
     }
@@ -154,9 +158,8 @@ protected void fillAttributes(final @NotNull Properties attributes) {
                         data.getSubmitActionName().toLowerCase(new Locale("en","EN")))
                 .appendProperty("DATA_PROVIDER",
                         new UiComponentDataProviderFile(
-                                data.getDataProviderName()
-                        ).getNamespaceBuilder(
                                 data.getModuleName(),
+                                data.getDataProviderName(),
                                 data.getDataProviderPath()
                         ).getClassFqn()
                 )
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridXmlGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridXmlGenerator.java
index a1efaa809..c808774f1 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridXmlGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/UiComponentGridXmlGenerator.java
@@ -8,6 +8,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.xml.XmlFile;
 import com.magento.idea.magento2plugin.actions.generation.data.UiComponentGridData;
 import com.magento.idea.magento2plugin.actions.generation.data.UiComponentGridToolbarData;
 import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
@@ -19,6 +20,7 @@
 import com.magento.idea.magento2plugin.magento.files.GridActionColumnFile;
 import com.magento.idea.magento2plugin.magento.files.UiComponentDataProviderFile;
 import com.magento.idea.magento2plugin.magento.files.UiComponentGridXmlFile;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.magento.packages.database.ColumnAttributes;
 import com.magento.idea.magento2plugin.magento.packages.database.TableColumnTypes;
@@ -30,6 +32,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
+import com.magento.idea.magento2plugin.util.magento.FileBasedIndexUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class UiComponentGridXmlGenerator extends FileGenerator {
@@ -52,18 +55,17 @@ public UiComponentGridXmlGenerator(
             final Project project
     ) {
         super(project);
-
         this.data = data;
         directoryGenerator = DirectoryGenerator.getInstance();
-        moduleIndex = ModuleIndex.getInstance(project);
-        fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
+        moduleIndex = new ModuleIndex(project);
+        fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
         getCodeTemplateUtil = new GetCodeTemplateUtil(project);
     }
 
     @Override
     public PsiFile generate(final String actionName) {
-        final String moduleName = this.data.getModuleName();
-        final PsiDirectory parentDirectory = this.moduleIndex.getModuleDirectoryByModuleName(
+        final String moduleName = data.getModuleName();
+        final PsiDirectory parentDirectory = moduleIndex.getModuleDirectoryByModuleName(
                 moduleName
         );
         final String subdirectory = String.format(
@@ -75,12 +77,26 @@ public PsiFile generate(final String actionName) {
         final PsiDirectory uiComponentDirectory =
                 directoryGenerator.findOrCreateSubdirectories(parentDirectory, subdirectory);
 
-        return this.fileFromTemplateGenerator.generate(
-                new UiComponentGridXmlFile(data.getName()),
-                getAttributes(),
-                uiComponentDirectory,
-                actionName
+        final UiComponentGridXmlFile file = new UiComponentGridXmlFile(data.getName());
+
+        XmlFile gridXmlFile = (XmlFile) FileBasedIndexUtil.findModuleViewFile(
+                file.getFileName(),
+                Areas.getAreaByString(data.getArea()),
+                moduleName,
+                project,
+                Package.moduleViewUiComponentDir
         );
+
+        if (gridXmlFile == null) {
+            gridXmlFile = (XmlFile) fileFromTemplateGenerator.generate(
+                    new UiComponentGridXmlFile(data.getName()),
+                    getAttributes(),
+                    uiComponentDirectory,
+                    actionName
+            );
+        }
+
+        return gridXmlFile;
     }
 
     /**
@@ -93,9 +109,8 @@ protected void fillAttributes(final @NotNull Properties attributes) {
         final PhpClassTypesBuilder phpClassTypesBuilder = new PhpClassTypesBuilder();
         final String dataProviderClassName =
                 new UiComponentDataProviderFile(
-                        data.getDataProviderName()
-                ).getNamespaceBuilder(
                         data.getModuleName(),
+                        data.getDataProviderName(),
                         data.getDataProviderPath()
                 ).getClassFqn();
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/code/XmlDeclarationsGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/code/XmlDeclarationsGenerator.java
index 4fabcd80d..b630f01eb 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/code/XmlDeclarationsGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/code/XmlDeclarationsGenerator.java
@@ -42,7 +42,7 @@ public XmlDeclarationsGenerator(
      *
      * @param formFile XmlFile
      */
-    public void generate(final XmlFile formFile) {
+    public void generate(final @NotNull XmlFile formFile) {
         final PsiDocumentManager psiDocumentManager =
                 PsiDocumentManager.getInstance(project);
         final Document document = psiDocumentManager.getDocument(formFile);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/pool/GeneratorPoolHandler.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/pool/GeneratorPoolHandler.java
index 55648813a..6bd0d6b4b 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/pool/GeneratorPoolHandler.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/pool/GeneratorPoolHandler.java
@@ -13,8 +13,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 import javax.swing.JOptionPane;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FileFromTemplateGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FileFromTemplateGenerator.java
index ed47a784d..a7aad6da3 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FileFromTemplateGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FileFromTemplateGenerator.java
@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.actions.generation.generator.util;
 
 import com.intellij.ide.fileTemplates.DefaultTemplatePropertiesProvider;
@@ -21,38 +22,42 @@
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.util.IncorrectOperationException;
 import com.magento.idea.magento2plugin.magento.files.ModuleFileInterface;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class FileFromTemplateGenerator {
-    private static FileFromTemplateGenerator INSTANCE = null;
-    private Project project;
+    private final Project project;
 
-    public static FileFromTemplateGenerator getInstance(Project project) {
-        if (null == INSTANCE) {
-            INSTANCE = new FileFromTemplateGenerator();
-        }
-        INSTANCE.project = project;
-        return INSTANCE;
+    public FileFromTemplateGenerator(final Project project) {
+        this.project = project;
     }
 
+    /**
+     * Generate file.
+     *
+     * @param moduleFile ModuleFileInterface
+     * @param attributes Properties
+     * @param baseDir PsiDirectory
+     * @param actionName String
+     * @return PsiFile
+     */
     @Nullable
     public PsiFile generate(
-            @NotNull ModuleFileInterface moduleFile,
-            @NotNull Properties attributes,
-            @NotNull PsiDirectory baseDir,
-            @NotNull String actionName)
-    {
-        Ref<PsiFile> fileRef = new Ref<>(null);
-        Ref<String> exceptionRef = new Ref<>(null);
-        String filePath = baseDir.getText().concat("/").concat(moduleFile.getFileName());
+            final @NotNull ModuleFileInterface moduleFile,
+            final @NotNull Properties attributes,
+            final @NotNull PsiDirectory baseDir,
+            final @NotNull String actionName
+    ) {
+        final Ref<PsiFile> fileRef = new Ref<>(null);
+        final Ref<String> exceptionRef = new Ref<>(null);
+        final String filePath = baseDir.getText().concat("/").concat(moduleFile.getFileName());
         CommandProcessor.getInstance().executeCommand(project, () -> {
-            Runnable run = () -> {
+            final Runnable run = () -> {
                 try {
                     PsiFile file = createFile(moduleFile, filePath, baseDir, attributes);
                     if (file != null) {
@@ -65,24 +70,24 @@ public PsiFile generate(
             ApplicationManager.getApplication().runWriteAction(run);
         }, actionName, null);
 
-        if (!exceptionRef.isNull()) {
-            Messages.showErrorDialog(exceptionRef.get(), actionName);
-            return null;
-        } else {
+        if (exceptionRef.isNull()) {
             return fileRef.get();
         }
+
+        Messages.showErrorDialog(exceptionRef.get(), actionName);
+        return null;
     }
 
     @Nullable
     private PsiFile createFile(
-            @NotNull ModuleFileInterface moduleFile,
-            @NotNull String filePath,
-            @NotNull PsiDirectory baseDir,
-            @NotNull Properties attributes
-    ) throws IOException, IncorrectOperationException {
-        List<String> path = StringUtil.split(filePath.replace(File.separator, "/"), "/");
-        String fileName = path.get(path.size() - 1);
-        PsiFile fileTemplate = createFileFromTemplate(
+            final @NotNull ModuleFileInterface moduleFile,
+            final @NotNull String filePath,
+            final @NotNull PsiDirectory baseDir,
+            final @NotNull Properties attributes
+    ) throws IOException {
+        final List<String> path = StringUtil.split(filePath.replace(File.separator, "/"), "/");
+        final String fileName = path.get(path.size() - 1);
+        final PsiFile fileTemplate = createFileFromTemplate(
                 getTemplateManager(),
                 baseDir, moduleFile.getTemplate(), attributes, fileName, moduleFile.getLanguage());
         if (fileTemplate == null) {
@@ -99,13 +104,25 @@ private PsiFile createFile(
         }
     }
 
+    /**
+     * Create file from code template.
+     *
+     * @param templateManager FileTemplateManager
+     * @param directory PsiDirectory
+     * @param templateName String
+     * @param properties Properties
+     * @param fileName String
+     * @param language Language
+     * @return PsiFile
+     * @throws IOException exception
+     */
     public PsiFile createFileFromTemplate(
-            @NotNull FileTemplateManager templateManager,
-            @NotNull PsiDirectory directory,
-            @NotNull String templateName,
-            @NotNull Properties properties,
-            @NotNull String fileName,
-            @NotNull Language language
+            final @NotNull FileTemplateManager templateManager,
+            final @NotNull PsiDirectory directory,
+            final @NotNull String templateName,
+            final @NotNull Properties properties,
+            final @NotNull String fileName,
+            final @NotNull Language language
     ) throws IOException {
         FileTemplate fileTemplate;
         try {
@@ -115,8 +132,14 @@ public PsiFile createFileFromTemplate(
         }
 
         fillDefaultProperties(templateManager, properties, directory);
-        String fileTemplateText = fileTemplate.getText(properties);
-        PsiFile file = PsiFileFactory.getInstance(project).createFileFromText(fileName, language, fileTemplateText, true, false);
+        final String fileTemplateText = fileTemplate.getText(properties);
+        final PsiFile file = PsiFileFactory.getInstance(project).createFileFromText(
+                fileName,
+                language,
+                fileTemplateText,
+                true,
+                false
+        );
         if (fileTemplate.isReformatCode()) {
             CodeStyleManager.getInstance(project).reformat(file);
         }
@@ -124,19 +147,34 @@ public PsiFile createFileFromTemplate(
         return file;
     }
 
-    public void fillDefaultProperties(@NotNull FileTemplateManager templateManager, @NotNull Properties props, @NotNull PsiDirectory directory) {
-        Properties hardCodedProperties = templateManager.getDefaultProperties();
+    /**
+     * Fill template properties.
+     *
+     * @param templateManager FileTemplateManager
+     * @param props Properties
+     * @param directory PsiDirectory
+     */
+    public void fillDefaultProperties(
+            final @NotNull FileTemplateManager templateManager,
+            final @NotNull Properties props,
+            final @NotNull PsiDirectory directory
+    ) {
+        final Properties hardCodedProperties = templateManager.getDefaultProperties();
         Iterator iterator = hardCodedProperties.keySet().iterator();
 
-        while(iterator.hasNext()) {
-            Object propertyKey = iterator.next();
-            props.setProperty((String)propertyKey, hardCodedProperties.getProperty((String)propertyKey));
+        while (iterator.hasNext()) {
+            final Object propertyKey = iterator.next();
+            props.setProperty(
+                    (String)propertyKey,
+                    hardCodedProperties.getProperty((String)propertyKey)
+            );
         }
 
         iterator = DefaultTemplatePropertiesProvider.EP_NAME.getExtensionList().iterator();
 
-        while(iterator.hasNext()) {
-            DefaultTemplatePropertiesProvider provider = (DefaultTemplatePropertiesProvider)iterator.next();
+        while (iterator.hasNext()) {
+            final DefaultTemplatePropertiesProvider provider
+                    = (DefaultTemplatePropertiesProvider)iterator.next();
             provider.fillProperties(directory, props);
         }
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateAclXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateAclXml.java
index e74410ff5..5a76a27f4 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateAclXml.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateAclXml.java
@@ -33,9 +33,9 @@ public FindOrCreateAclXml(final Project project) {
     public PsiFile execute(final String actionName, final String moduleName) {
         final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
         final FileFromTemplateGenerator fileFromTemplateGenerator =
-                FileFromTemplateGenerator.getInstance(project);
+                new FileFromTemplateGenerator(project);
 
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
         parentDirectory = directoryGenerator
                 .findOrCreateSubdirectory(parentDirectory, Package.moduleBaseAreaDir);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateCronGroupXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateCronGroupXml.java
index 23b07b1b5..40f1bf0ac 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateCronGroupXml.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateCronGroupXml.java
@@ -31,8 +31,8 @@ public class FindOrCreateCronGroupXml {
     public FindOrCreateCronGroupXml(final Project project) {
         this.project = project;
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        this.moduleIndex = ModuleIndex.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        this.moduleIndex = new ModuleIndex(project);
     }
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateCrontabXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateCrontabXml.java
index ac3afa699..6a0e4800d 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateCrontabXml.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateCrontabXml.java
@@ -31,8 +31,8 @@ public FindOrCreateCrontabXml(final Project project) {
         this.project = project;
 
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        this.moduleIndex = ModuleIndex.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        this.moduleIndex = new ModuleIndex(project);
     }
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDbSchemaWhitelistJson.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDbSchemaWhitelistJson.java
index 4e443f3e8..01c5258a2 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDbSchemaWhitelistJson.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDbSchemaWhitelistJson.java
@@ -39,7 +39,7 @@ public FindOrCreateDbSchemaWhitelistJson(final @NotNull Project project) {
     public PsiFile execute(final @NotNull String actionName, final @NotNull String moduleName) {
         final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
         final FileFromTemplateGenerator fileFromTemplateGenerator =
-                FileFromTemplateGenerator.getInstance(project);
+                new FileFromTemplateGenerator(project);
 
         final ModuleDbSchemaWhitelistJson moduleDbSchemaWhitelistJson =
                 ModuleDbSchemaWhitelistJson.getInstance();
@@ -52,7 +52,7 @@ public PsiFile execute(final @NotNull String actionName, final @NotNull String m
         );
 
         if (dbSchemaWhitelistJson == null) {
-            PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+            PsiDirectory parentDirectory = new ModuleIndex(project)
                     .getModuleDirectoryByModuleName(moduleName);
             parentDirectory = directoryGenerator
                     .findOrCreateSubdirectory(parentDirectory, Package.moduleBaseAreaDir);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDbSchemaXmlUtil.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDbSchemaXmlUtil.java
index 189f2eaf5..2d70471ac 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDbSchemaXmlUtil.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDbSchemaXmlUtil.java
@@ -33,9 +33,9 @@ public FindOrCreateDbSchemaXmlUtil(final Project project) {
     public PsiFile execute(final String actionName, final String moduleName) {
         final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
         final FileFromTemplateGenerator fileFromTemplateGenerator =
-                FileFromTemplateGenerator.getInstance(project);
+                new FileFromTemplateGenerator(project);
 
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
         parentDirectory = directoryGenerator
                 .findOrCreateSubdirectory(parentDirectory, Package.moduleBaseAreaDir);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDiXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDiXml.java
index 7ea4fab42..854b59358 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDiXml.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateDiXml.java
@@ -34,9 +34,9 @@ public FindOrCreateDiXml(final Project project) {
     public PsiFile execute(final String actionName, final String moduleName, final String area) {
         final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
         final FileFromTemplateGenerator fileFromTemplateGenerator =
-                FileFromTemplateGenerator.getInstance(project);
+                new FileFromTemplateGenerator(project);
 
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
         final ArrayList<String> fileDirectories = new ArrayList<>();
         fileDirectories.add(Package.moduleBaseAreaDir);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateEmailTemplatesXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateEmailTemplatesXml.java
new file mode 100644
index 000000000..f37e0e75b
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateEmailTemplatesXml.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.generator.util;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiFile;
+import com.magento.idea.magento2plugin.indexes.ModuleIndex;
+import com.magento.idea.magento2plugin.magento.files.EmailTemplatesXml;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
+import com.magento.idea.magento2plugin.magento.packages.Package;
+import com.magento.idea.magento2plugin.util.magento.FileBasedIndexUtil;
+import java.util.ArrayList;
+import java.util.Properties;
+
+@SuppressWarnings({"PMD.OnlyOneReturn"})
+public class FindOrCreateEmailTemplatesXml {
+    private final Project project;
+    private final DirectoryGenerator directoryGenerator;
+    private final FileFromTemplateGenerator fileFromTemplateGenerator;
+    private final ModuleIndex moduleIndex;
+
+    /**
+     * Find or create email templates XML controller.
+     *
+     * @param project Project
+     */
+    public FindOrCreateEmailTemplatesXml(final Project project) {
+        this.project = project;
+        this.directoryGenerator = DirectoryGenerator.getInstance();
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        this.moduleIndex = new ModuleIndex(project);
+    }
+
+    /**
+     * Find or create email_templates.xml file in the module.
+     *
+     * @param actionName action name
+     * @param moduleName module name
+     *
+     * @return PsiFile
+     */
+    public PsiFile execute(final String actionName, final String moduleName) {
+        PsiDirectory parentDirectory = this.moduleIndex.getModuleDirectoryByModuleName(moduleName);
+        final ArrayList<String> fileDirectories = new ArrayList<>();
+
+        fileDirectories.add(Package.moduleBaseAreaDir);
+
+        for (final String fileDirectory: fileDirectories) {
+            parentDirectory = this.directoryGenerator.findOrCreateSubdirectory(
+                    parentDirectory,
+                    fileDirectory
+            );
+        }
+
+        final EmailTemplatesXml emailTemplatesXml = new EmailTemplatesXml();
+        PsiFile emailTemplatesFile = FileBasedIndexUtil.findModuleConfigFile(
+                emailTemplatesXml.getFileName(),
+                Areas.base,
+                moduleName,
+                project
+        );
+
+        // email_templates.xml is already declared
+        if (emailTemplatesFile != null) {
+            return emailTemplatesFile;
+        }
+
+        // create a new empty email_templates.xml file
+        emailTemplatesFile = fileFromTemplateGenerator.generate(
+                emailTemplatesXml,
+                new Properties(),
+                parentDirectory,
+                actionName
+        );
+
+        return emailTemplatesFile;
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateEventsXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateEventsXml.java
index c760a1f42..23d44f2b1 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateEventsXml.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateEventsXml.java
@@ -38,8 +38,8 @@ public PsiFile execute(
     ) {
         final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
         final FileFromTemplateGenerator fileFromTemplateGenerator =
-                FileFromTemplateGenerator.getInstance(project);
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+                new FileFromTemplateGenerator(project);
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
         final ArrayList<String> fileDirectories = new ArrayList<>();
         fileDirectories.add(Package.moduleBaseAreaDir);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateLayoutXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateLayoutXml.java
index 89be79cb8..e77bebfdd 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateLayoutXml.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateLayoutXml.java
@@ -45,9 +45,9 @@ public PsiFile execute(
     ) {
         final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
         final FileFromTemplateGenerator fileFromTemplateGenerator =
-                FileFromTemplateGenerator.getInstance(project);
+                new FileFromTemplateGenerator(project);
 
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
         final ArrayList<String> fileDirectories = new ArrayList<>();
         fileDirectories.add(Package.moduleViewDir);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateMenuXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateMenuXml.java
index 0fbf0da7b..d699ce927 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateMenuXml.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateMenuXml.java
@@ -33,9 +33,9 @@ public FindOrCreateMenuXml(final Project project) {
     public PsiFile execute(final String actionName, final String moduleName) {
         final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
         final FileFromTemplateGenerator fileFromTemplateGenerator =
-                FileFromTemplateGenerator.getInstance(project);
+                new FileFromTemplateGenerator(project);
 
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
         final ArrayList<String> fileDirectories = new ArrayList<>();
         fileDirectories.add(Package.moduleBaseAreaDir);
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateQueueXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateQueueXml.java
index 0f9e47d5c..72a2d0781 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateQueueXml.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateQueueXml.java
@@ -29,8 +29,8 @@ public FindOrCreateQueueXml(final Project project) {
         this.project = project;
 
         this.directoryGenerator = DirectoryGenerator.getInstance();
-        this.fileFromTemplateGenerator = FileFromTemplateGenerator.getInstance(project);
-        this.moduleIndex = ModuleIndex.getInstance(project);
+        this.fileFromTemplateGenerator = new FileFromTemplateGenerator(project);
+        this.moduleIndex = new ModuleIndex(project);
     }
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateRoutesXml.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateRoutesXml.java
index beae9b6fd..385aef23a 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateRoutesXml.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FindOrCreateRoutesXml.java
@@ -34,9 +34,9 @@ public FindOrCreateRoutesXml(final Project project) {
     public PsiFile execute(final String actionName, final String moduleName, final String area) {
         final DirectoryGenerator directoryGenerator = DirectoryGenerator.getInstance();
         final FileFromTemplateGenerator fileFromTemplateGenerator =
-                FileFromTemplateGenerator.getInstance(project);
+                new FileFromTemplateGenerator(project);
 
-        PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
+        PsiDirectory parentDirectory = new ModuleIndex(project)
                 .getModuleDirectoryByModuleName(moduleName);
         final ArrayList<String> fileDirectories = new ArrayList<>();
         fileDirectories.add(Package.moduleBaseAreaDir);
diff --git a/src/com/magento/idea/magento2plugin/completion/provider/PhpClassCompletionProvider.java b/src/com/magento/idea/magento2plugin/completion/provider/PhpClassCompletionProvider.java
index b86dde94d..30be46ece 100644
--- a/src/com/magento/idea/magento2plugin/completion/provider/PhpClassCompletionProvider.java
+++ b/src/com/magento/idea/magento2plugin/completion/provider/PhpClassCompletionProvider.java
@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.completion.provider;
 
 import com.intellij.codeInsight.completion.CompletionParameters;
@@ -18,79 +19,98 @@
 import com.jetbrains.php.lang.psi.elements.PhpNamespace;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 import gnu.trove.THashSet;
-import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 public class PhpClassCompletionProvider extends CompletionProvider<CompletionParameters> {
 
-    final private static String PHP_CLASS_COMPLETION_REGEX
+    private static final String PHP_CLASS_COMPLETION_REGEX
             = "\\\\?" + RegExUtil.PhpRegex.FQN + "\\\\?";
 
+    @SuppressWarnings({
+            "PMD.CyclomaticComplexity",
+            "PMD.NPathComplexity"
+    })
     @Override
-    protected void addCompletions(@NotNull CompletionParameters parameters,
-                                  ProcessingContext context,
-                                  @NotNull CompletionResultSet result) {
-        PsiElement position = parameters.getPosition().getOriginalElement();
+    protected void addCompletions(
+            final @NotNull CompletionParameters parameters,
+            final ProcessingContext context,
+            final @NotNull CompletionResultSet result
+    ) {
+        final PsiElement position = parameters.getPosition().getOriginalElement();
         if (position == null) {
             return;
         }
-        String prefix = result.getPrefixMatcher().getPrefix();
-        Matcher matcher = Pattern.compile(PHP_CLASS_COMPLETION_REGEX).matcher(prefix);
+        final String prefix = result.getPrefixMatcher().getPrefix();
+        final Matcher matcher = Pattern.compile(PHP_CLASS_COMPLETION_REGEX)
+                .matcher(prefix);
         if (!matcher.matches()) {
             return;
         }
 
-        String className = prefix.lastIndexOf(92) < 0 ? prefix : prefix.substring(prefix.lastIndexOf(92) + 1);
-        String namespace = prefix.lastIndexOf(92) < 0 ? "" : prefix.substring(0, prefix.lastIndexOf(92));
+        final String className = prefix.lastIndexOf(92) < 0 ? prefix : prefix
+                .substring(prefix.lastIndexOf(92) + 1);
+        final String namespace = prefix.lastIndexOf(92) < 0 ? "" : prefix
+                .substring(0, prefix.lastIndexOf(92));
 
-        PhpIndex phpIndex = PhpIndex.getInstance(parameters.getPosition().getProject());
+        final PhpIndex phpIndex = PhpIndex.getInstance(
+                parameters.getPosition().getProject()
+        );
 
         final Collection<PhpClass> phpClasses = new THashSet<>();
         Collection<String> namespaceNames = new ArrayList<>();
 
-        if (!className.isEmpty()) {
-            // case for input: "SomeClassOrNamespace"
-
-            // add classes
-            Collection<String> classNames = phpIndex.getAllClassNames(new CamelHumpMatcher(className));
-            for (String cName: classNames) {
-                phpClasses.addAll(phpIndex.getClassesByName(cName));
+        if (className.isEmpty()) {
+            // add namespaces
+            final Collection<PhpNamespace> namespaces
+                    = phpIndex.getNamespacesByName(("\\" + namespace)
+                        .toLowerCase(Locale.ROOT));
+            for (final PhpNamespace nsp: namespaces) {
+                phpClasses.addAll(PsiTreeUtil.getChildrenOfTypeAsList(
+                        nsp.getStatements(),
+                        PhpClass.class
+                    )
+                );
             }
+
+            // add namespaces and classes (string representation)
+            namespaceNames
+                = phpIndex.getChildNamespacesByParentName("\\".concat(namespace)
+                .concat("\\").toLowerCase(Locale.ROOT));
+            namespaceNames
+                = namespaceNames.stream().map(n -> namespace.concat("\\")
+                .concat(n)).collect(Collectors.toList());
+        } else {
             // add interfaces
-            Collection<String> interfaceNames = phpIndex.getAllInterfaceNames();
-            interfaceNames.removeIf(i -> !i.contains(className));
-            for (String iName: interfaceNames) {
+            final Collection<String> interfaceNames = phpIndex.getAllInterfaceNames();
+            interfaceNames.removeIf(i -> !i.contains(className.toLowerCase(Locale.ROOT)));
+            for (final String iName: interfaceNames) {
                 phpClasses.addAll(phpIndex.getInterfacesByName(iName));
             }
-            if (!namespace.isEmpty()) {
-                phpClasses.removeIf(c -> !c.getPresentableFQN().startsWith(namespace));
-            } else {
+            // add classes
+            final Collection<String> classNames = phpIndex.getAllClassNames(
+                    new CamelHumpMatcher(className)
+            );
+            for (final String cName: classNames) {
+                phpClasses.addAll(phpIndex.getClassesByName(cName));
+            }
+            if (namespace.isEmpty()) {
                 namespaceNames = phpIndex.getChildNamespacesByParentName("\\");
                 namespaceNames.removeIf(n -> !n.contains(prefix));
+            } else {
+                phpClasses.removeIf(c -> !c.getPresentableFQN().startsWith(namespace));
             }
-        } else {
-            // case for input: "Some\Namespace\ + ^+<Space>"
-
-            // add namespaces
-            Collection<PhpNamespace> namespaces = phpIndex.getNamespacesByName(("\\" + namespace).toLowerCase());
-            for (PhpNamespace nsp: namespaces) {
-                phpClasses.addAll(PsiTreeUtil.getChildrenOfTypeAsList(nsp.getStatements(), PhpClass.class));
-            }
-
-            // add namespaces and classes (string representation)
-            namespaceNames
-                    = phpIndex.getChildNamespacesByParentName("\\".concat(namespace).concat("\\").toLowerCase());
-            namespaceNames
-                    = namespaceNames.stream().map(n -> namespace.concat("\\").concat(n)).collect(Collectors.toList());
         }
 
         // add all above founded items to lookup builder
-        // order is important (items with the same name override each other), add classes first
-        for (PhpClass phpClass : phpClasses) {
+        // order is important (items with the same name override each other),
+        // add classes first
+        for (final PhpClass phpClass : phpClasses) {
             result.addElement(
                     LookupElementBuilder
                             .create(phpClass.getPresentableFQN())
@@ -98,7 +118,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters,
             );
         }
 
-        for (String nsName : namespaceNames) {
+        for (final String nsName : namespaceNames) {
             result.addElement(
                     LookupElementBuilder
                             .create(nsName)
diff --git a/src/com/magento/idea/magento2plugin/generation/php/MagentoModuleGenerator.java b/src/com/magento/idea/magento2plugin/generation/php/MagentoModuleGenerator.java
index 141512e3c..b6c9d669b 100644
--- a/src/com/magento/idea/magento2plugin/generation/php/MagentoModuleGenerator.java
+++ b/src/com/magento/idea/magento2plugin/generation/php/MagentoModuleGenerator.java
@@ -31,7 +31,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-
 public class MagentoModuleGenerator extends WebProjectTemplate<MagentoProjectGeneratorSettings> {
     public static String actionName = "Magento 2 Module";
 
@@ -133,7 +132,7 @@ private PsiFile generateComposerJson(
      * @param project Project
      * @param baseDir Base directory
      * @param settings Settings
-     * @return
+     * @return void
      */
     private PsiFile generateRegistrationPhp(
             @NotNull final Project project,
@@ -165,6 +164,7 @@ private void generateModuleXml(
                 settings.getModuleName(),
                 settings.getModuleVersion(),
                 baseDir,
+                new ArrayList<>(),
                 false
         );
         final ModuleXmlGenerator moduleXmlGenerator =
diff --git a/src/com/magento/idea/magento2plugin/indexes/EventIndex.java b/src/com/magento/idea/magento2plugin/indexes/EventIndex.java
index f0faf8de6..0641e92e1 100644
--- a/src/com/magento/idea/magento2plugin/indexes/EventIndex.java
+++ b/src/com/magento/idea/magento2plugin/indexes/EventIndex.java
@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.indexes;
 
 import com.intellij.openapi.project.Project;
@@ -13,41 +14,67 @@
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.magento.idea.magento2plugin.stubs.indexes.EventNameIndex;
+import com.magento.idea.magento2plugin.stubs.indexes.EventObserverIndex;
 import com.magento.idea.magento2plugin.util.xml.XmlPsiTreeUtil;
-
 import java.util.ArrayList;
 import java.util.Collection;
 
 public class EventIndex {
 
-    private static EventIndex INSTANCE;
-
-    private Project project;
-
-    private EventIndex() {
-    }
-
-    public static EventIndex getInstance(final Project project) {
-        if (null == INSTANCE) {
-            INSTANCE = new EventIndex();
-        }
-        INSTANCE.project = project;
+    private final Project project;
 
-        return INSTANCE;
+    /**
+     * Constructor.
+     */
+    public EventIndex(final Project project) {
+        this.project = project;
     }
 
-    public Collection<PsiElement> getEventElements(final String name, final GlobalSearchScope scope) {
-        Collection<PsiElement> result = new ArrayList<>();
+    /**
+     * Gets event elements by event name.
+     */
+    public Collection<PsiElement> getEventElements(
+            final String name,
+            final GlobalSearchScope scope
+    ) {
+        final Collection<PsiElement> result = new ArrayList<>();
 
-        Collection<VirtualFile> virtualFiles =
+        final Collection<VirtualFile> virtualFiles =
                 FileBasedIndex.getInstance().getContainingFiles(EventNameIndex.KEY, name, scope);
 
-        for (VirtualFile virtualFile : virtualFiles) {
-            XmlFile xmlFile = (XmlFile) PsiManager.getInstance(project).findFile(virtualFile);
-            Collection<XmlAttributeValue> valueElements = XmlPsiTreeUtil
+        for (final VirtualFile virtualFile : virtualFiles) {
+            final XmlFile xmlFile = (XmlFile) PsiManager.getInstance(project).findFile(virtualFile);
+            final Collection<XmlAttributeValue> valueElements = XmlPsiTreeUtil
                     .findAttributeValueElements(xmlFile, "event", "name", name);
             result.addAll(valueElements);
         }
         return result;
     }
+
+    /**
+     * Gets observers by event-observer name combination.
+     */
+    public Collection<PsiElement> getObservers(
+            final String eventName,
+            final String observerName,
+            final GlobalSearchScope scope
+    ) {
+        final Collection<PsiElement> result = new ArrayList<>();
+        final Collection<VirtualFile> virtualFiles
+                = FileBasedIndex.getInstance().getContainingFiles(
+                        EventObserverIndex.KEY, eventName, scope
+                );
+
+        for (final VirtualFile virtualFile: virtualFiles) {
+            final XmlFile eventsXmlFile
+                    = (XmlFile) PsiManager.getInstance(project).findFile(virtualFile);
+            if (eventsXmlFile != null) {
+                result.addAll(
+                        XmlPsiTreeUtil.findObserverTags(eventsXmlFile, eventName, observerName)
+                );
+            }
+        }
+
+        return result;
+    }
 }
diff --git a/src/com/magento/idea/magento2plugin/indexes/ModuleIndex.java b/src/com/magento/idea/magento2plugin/indexes/ModuleIndex.java
index c0c5c4157..c3facb976 100644
--- a/src/com/magento/idea/magento2plugin/indexes/ModuleIndex.java
+++ b/src/com/magento/idea/magento2plugin/indexes/ModuleIndex.java
@@ -26,26 +26,15 @@
 
 public final class ModuleIndex {
 
-    private static ModuleIndex instance;
-
-    private Project project;
-
-    private ModuleIndex() {
-    }
+    private final Project project;
 
     /**
      * Constructor.
      *
      * @param project Project
-     * @return ModuleIndex
      */
-    public static ModuleIndex getInstance(final Project project) {
-        if (null == instance) { //NOPMD
-            instance = new ModuleIndex();
-        }
-        instance.project = project;
-
-        return instance;
+    public ModuleIndex(final Project project) {
+        this.project = project;
     }
 
     public List<String> getEditableModuleNames() {
diff --git a/src/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspection.java b/src/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspection.java
index f97697147..b87e429ec 100644
--- a/src/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspection.java
+++ b/src/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspection.java
@@ -8,6 +8,7 @@
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.codeInspection.XmlSuppressableInspectionTool;
+import com.intellij.patterns.XmlAttributeValuePattern;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiFile;
@@ -54,24 +55,26 @@ public void visitXmlAttributeValue(final XmlAttributeValue value) {
                     return;
                 }
 
-                final String expectedName
-                        = GetEditableModuleNameByRootFileUtil.execute(etcDirectory);
-                final String actualName = value.getValue();
-                if (actualName.equals(expectedName)) {
-                    return;
+                final String attributeName = XmlAttributeValuePattern.getLocalName(value);
+                if (attributeName != null && attributeName.equals(ModuleXml.MODULE_ATTR_NAME)) {
+                    final String expectedName
+                            = GetEditableModuleNameByRootFileUtil.execute(etcDirectory);
+                    final String actualName = value.getValue();
+                    if (actualName.equals(expectedName)) {
+                        return;
+                    }
+                    final InspectionBundle inspectionBundle = new InspectionBundle();
+                    problemsHolder.registerProblem(
+                            value,
+                            inspectionBundle.message(
+                                    "inspection.moduleDeclaration.warning.wrongModuleName",
+                                    actualName,
+                                    expectedName
+                            ),
+                            ProblemHighlightType.ERROR,
+                            new XmlModuleNameQuickFix(expectedName)
+                    );
                 }
-
-                final InspectionBundle inspectionBundle = new InspectionBundle();
-                problemsHolder.registerProblem(
-                        value,
-                        inspectionBundle.message(
-                                "inspection.moduleDeclaration.warning.wrongModuleName",
-                                actualName,
-                                expectedName
-                        ),
-                        ProblemHighlightType.ERROR,
-                        new XmlModuleNameQuickFix(expectedName)
-                );
             }
         };
     }
diff --git a/src/com/magento/idea/magento2plugin/inspections/xml/ObserverDeclarationInspection.java b/src/com/magento/idea/magento2plugin/inspections/xml/ObserverDeclarationInspection.java
index a489bef89..a687e7bbd 100644
--- a/src/com/magento/idea/magento2plugin/inspections/xml/ObserverDeclarationInspection.java
+++ b/src/com/magento/idea/magento2plugin/inspections/xml/ObserverDeclarationInspection.java
@@ -44,6 +44,7 @@ public class ObserverDeclarationInspection extends PhpInspection {
 
     @NotNull
     @Override
+    @SuppressWarnings({"PMD.AvoidInstantiatingObjectsInLoops"})
     public PsiElementVisitor buildVisitor(
             final @NotNull ProblemsHolder problemsHolder,
             final boolean isOnTheFly
@@ -66,12 +67,12 @@ public void visitFile(final PsiFile file) {
                     return;
                 }
 
-                final EventIndex eventIndex = EventIndex.getInstance(file.getProject());
+                final EventIndex eventIndex = new EventIndex(file.getProject());
                 final HashMap<String, XmlTag> targetObserversHash = new HashMap<>();
 
                 for (final XmlTag eventXmlTag: xmlTags) {
                     final HashMap<String, XmlTag> eventProblems = new HashMap<>();
-                    if (!eventXmlTag.getName().equals("event")) {
+                    if (!eventXmlTag.getName().equals(ModuleEventsXml.EVENT_TAG)) {
                         continue;
                     }
 
@@ -236,7 +237,7 @@ private List<XmlTag> fetchObserverTagsFromEventTag(final XmlTag eventXmlTag) {
                 }
 
                 for (final XmlTag observerXmlTag: observerXmlTags) {
-                    if (!observerXmlTag.getName().equals("observer")) {
+                    if (!observerXmlTag.getName().equals(ModuleEventsXml.OBSERVER_TAG)) {
                         continue;
                     }
 
@@ -257,10 +258,11 @@ private void addModuleNameWhereSameObserverUsed(
                     return;
                 }
 
-                if (!moduleDeclarationTag.getName().equals("module")) {
+                if (!moduleDeclarationTag.getName().equals(ModuleEventsXml.MODULE_TAG)) {
                     return;
                 }
-                final XmlAttribute moduleNameAttribute = moduleDeclarationTag.getAttribute("name");
+                final XmlAttribute moduleNameAttribute
+                        = moduleDeclarationTag.getAttribute(ModuleEventsXml.NAME_ATTRIBUTE);
                 if (moduleNameAttribute == null) {
                     return;
                 }
diff --git a/src/com/magento/idea/magento2plugin/magento/files/AbstractPhpClass.java b/src/com/magento/idea/magento2plugin/magento/files/AbstractPhpClass.java
deleted file mode 100644
index 4d5f1f96a..000000000
--- a/src/com/magento/idea/magento2plugin/magento/files/AbstractPhpClass.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-package com.magento.idea.magento2plugin.magento.files;
-
-import com.intellij.lang.Language;
-import com.jetbrains.php.lang.PhpLanguage;
-import org.jetbrains.annotations.NotNull;
-
-public abstract class AbstractPhpClass implements ModuleFileInterface {
-    private final String fileName;
-    private final String className;
-
-    public AbstractPhpClass(final @NotNull String className) {
-        this.className = className;
-        fileName = className.concat(".php");
-    }
-
-    /**
-     * Get class name.
-     *
-     * @return String
-     */
-    public String getClassName() {
-        return className;
-    }
-
-    @Override
-    public String getFileName() {
-        return this.fileName;
-    }
-
-    @Override
-    public Language getLanguage() {
-        return PhpLanguage.INSTANCE;
-    }
-}
diff --git a/src/com/magento/idea/magento2plugin/magento/files/AbstractPhpFile.java b/src/com/magento/idea/magento2plugin/magento/files/AbstractPhpFile.java
new file mode 100644
index 000000000..bd008f2ba
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/magento/files/AbstractPhpFile.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.magento.files;
+
+import com.intellij.lang.Language;
+import com.jetbrains.php.lang.PhpLanguage;
+import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class AbstractPhpFile implements ModuleFileInterface {
+
+    public static final String FILE_EXTENSION = "php";
+    private final String moduleName;
+    private final String className;
+    private NamespaceBuilder namespaceBuilder;
+
+    /**
+     * Abstract php file constructor.
+     *
+     * @param moduleName String
+     * @param className String
+     */
+    public AbstractPhpFile(
+            final @NotNull String moduleName,
+            final @NotNull String className
+    ) {
+        this.moduleName = moduleName;
+        this.className = className;
+    }
+
+    /**
+     * Get namespace.
+     *
+     * @return String
+     */
+    public @NotNull String getNamespace() {
+        return getNamespaceBuilder().getNamespace();
+    }
+
+    /**
+     * Get class FQN.
+     *
+     * @return String
+     */
+    public @NotNull String getClassFqn() {
+        return getNamespaceBuilder().getClassFqn();
+    }
+
+    /**
+     * Get namespace builder for file.
+     *
+     * @return String
+     */
+    public @NotNull NamespaceBuilder getNamespaceBuilder() {
+        if (namespaceBuilder == null) {
+            namespaceBuilder = new NamespaceBuilder(
+                    moduleName,
+                    className,
+                    getDirectory()
+            );
+        }
+
+        return namespaceBuilder;
+    }
+
+    /**
+     * Get directory for file.
+     *
+     * @return String
+     */
+    public abstract String getDirectory();
+
+    /**
+     * Get file module name.
+     *
+     * @return String
+     */
+    public String getModuleName() {
+        return moduleName;
+    }
+
+    /**
+     * Get class name.
+     *
+     * @return String
+     */
+    public String getClassName() {
+        return className;
+    }
+
+    /**
+     * Get readable name. Should be overridden to use.
+     *
+     * @return String
+     */
+    public String getHumanReadableName() {
+        return null;
+    }
+
+    @Override
+    public String getFileName() {
+        return className.concat(".").concat(FILE_EXTENSION);
+    }
+
+    @Override
+    public Language getLanguage() {
+        return PhpLanguage.INSTANCE;
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/magento/files/CollectionModelFile.java b/src/com/magento/idea/magento2plugin/magento/files/CollectionModelFile.java
index d9061ec67..56159f74b 100644
--- a/src/com/magento/idea/magento2plugin/magento/files/CollectionModelFile.java
+++ b/src/com/magento/idea/magento2plugin/magento/files/CollectionModelFile.java
@@ -5,54 +5,43 @@
 
 package com.magento.idea.magento2plugin.magento.files;
 
-import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import org.jetbrains.annotations.NotNull;
 
-public class CollectionModelFile extends AbstractPhpClass {
+public class CollectionModelFile extends AbstractPhpFile {
+
     public static final String TEMPLATE = "Magento Collection Class";
+    public static final String HUMAN_READABLE_NAME = "Collection class";
     public static final String ABSTRACT_COLLECTION
             = "Magento\\Framework\\Model\\ResourceModel\\Db\\Collection\\AbstractCollection";
-    private NamespaceBuilder namespaceBuilder;
-
-    public CollectionModelFile(final @NotNull String className) {
-        super(className);
-    }
+    private final String directoryName;
 
     /**
-     * Get namespace builder for file.
+     * Collection model file constructor.
      *
      * @param moduleName String
+     * @param className String
      * @param directoryName String
-     *
-     * @return String
      */
-    public @NotNull NamespaceBuilder getNamespaceBuilder(
+    public CollectionModelFile(
             final @NotNull String moduleName,
+            final @NotNull String className,
             final @NotNull String directoryName
     ) {
-        if (namespaceBuilder == null) {
-            namespaceBuilder = new NamespaceBuilder(
-                    moduleName,
-                    getClassName(),
-                    getDirectory(directoryName)
-            );
-        }
-
-        return namespaceBuilder;
+        super(moduleName, className);
+        this.directoryName = directoryName;
     }
 
-    /**
-     * Get collection file directory.
-     *
-     * @param directoryName String
-     *
-     * @return String
-     */
-    public @NotNull String getDirectory(final @NotNull String directoryName) {
+    @Override
+    public @NotNull String getDirectory() {
         return ResourceModelFile.RESOURCE_MODEL_DIRECTORY + File.separator + directoryName;
     }
 
+    @Override
+    public String getHumanReadableName() {
+        return HUMAN_READABLE_NAME;
+    }
+
     @Override
     public String getTemplate() {
         return TEMPLATE;
diff --git a/src/com/magento/idea/magento2plugin/magento/files/EmailTemplateHtml.java b/src/com/magento/idea/magento2plugin/magento/files/EmailTemplateHtml.java
new file mode 100644
index 000000000..deb31f0b6
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/magento/files/EmailTemplateHtml.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.magento.files;
+
+import com.intellij.lang.Language;
+import com.intellij.lang.html.HTMLLanguage;
+
+public class EmailTemplateHtml implements ModuleFileInterface {
+    public static final String TEMPLATE = "Magento Module Email Template Html";
+    public static final String HTML_TYPE = "html";
+    public static final String TEXT_TYPE = "text";
+    public static final String HTML_FILE_EXTENSION = "html";
+    private static EmailTemplateHtml instance;
+    private String fileName;
+
+    /**
+     * Returns a new instance of the class.
+     *
+     * @return EmailTemplatesXml
+     */
+    public static EmailTemplateHtml getInstance(final String fileName) {
+        if (null == instance) { //NOPMD
+            instance = new EmailTemplateHtml();
+        }
+
+        instance.setFileName(fileName);
+
+        return instance;
+    }
+
+    @Override
+    public String getFileName() {
+        return String.format("%s.%s", this.fileName, HTML_FILE_EXTENSION);
+    }
+
+    @Override
+    public String getTemplate() {
+        return TEMPLATE;
+    }
+
+    @Override
+    public Language getLanguage() {
+        return HTMLLanguage.INSTANCE;
+    }
+
+    private void setFileName(final String fileName) {
+        this.fileName = fileName;
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/magento/files/EmailTemplatesXml.java b/src/com/magento/idea/magento2plugin/magento/files/EmailTemplatesXml.java
new file mode 100644
index 000000000..03844f4cd
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/magento/files/EmailTemplatesXml.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.magento.files;
+
+import com.intellij.lang.Language;
+import com.intellij.lang.xml.XMLLanguage;
+
+public class EmailTemplatesXml implements ModuleFileInterface {
+    public static final String TEMPLATE = "Magento Module Email Templates Xml";
+    public static final String FILE_NAME = "email_templates.xml";
+
+    // code templates
+    public static final String EMAIL_TEMPLATE_REGISTRATION = "Magento Module Email Template Xml";
+
+    // XML definitions
+    public static final String TEMPLATE_TAG = "template";
+    public static final String TEMPLATE_ID_ATTRIBUTE = "id";
+
+    private static EmailTemplatesXml instance;
+
+    /**
+     * Returns a new instance of the class.
+     *
+     * @return EmailTemplatesXml
+     */
+    public static EmailTemplatesXml getInstance() {
+        if (null == instance) { //NOPMD
+            instance = new EmailTemplatesXml();
+        }
+
+        return instance;
+    }
+
+    @Override
+    public String getFileName() {
+        return FILE_NAME;
+    }
+
+    @Override
+    public String getTemplate() {
+        return TEMPLATE;
+    }
+
+    @Override
+    public Language getLanguage() {
+        return XMLLanguage.INSTANCE;
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/magento/files/FormButtonBlockFile.java b/src/com/magento/idea/magento2plugin/magento/files/FormButtonBlockFile.java
index f705a3ab7..38267b50f 100644
--- a/src/com/magento/idea/magento2plugin/magento/files/FormButtonBlockFile.java
+++ b/src/com/magento/idea/magento2plugin/magento/files/FormButtonBlockFile.java
@@ -7,27 +7,45 @@
 
 import org.jetbrains.annotations.NotNull;
 
-public class FormButtonBlockFile extends AbstractPhpClass {
-    public static String template = "Magento Form Button Block Class";
+public class FormButtonBlockFile extends AbstractPhpFile {
+
+    public static final String TEMPLATE = "Magento Form Button Block Class";
+    public static final String HUMAN_READABLE_NAME = "Form button block class";
     public static final String DATA_PROVIDER_TYPE =
             "Magento\\Framework\\View\\Element\\UiComponent\\Control\\ButtonProviderInterface";
-
     public static final String TYPE_SAVE = "Save";
     public static final String TYPE_DELETE = "Delete";
     public static final String TYPE_BACK = "Back";
     public static final String TYPE_CUSTOM = "Custom";
+    private final String directoryName;
 
     /**
      * Form button block file constructor.
      *
+     * @param moduleName String
      * @param className String
      */
-    public FormButtonBlockFile(final @NotNull String className) {
-        super(className);
+    public FormButtonBlockFile(
+            final @NotNull String moduleName,
+            final @NotNull String className,
+            final @NotNull String directoryName
+    ) {
+        super(moduleName, className);
+        this.directoryName = directoryName;
+    }
+
+    @Override
+    public String getDirectory() {
+        return directoryName;
+    }
+
+    @Override
+    public String getHumanReadableName() {
+        return HUMAN_READABLE_NAME;
     }
 
     @Override
     public String getTemplate() {
-        return template;
+        return TEMPLATE;
     }
 }
diff --git a/src/com/magento/idea/magento2plugin/magento/files/ModelFile.java b/src/com/magento/idea/magento2plugin/magento/files/ModelFile.java
index da8ca90b7..e7985fcba 100644
--- a/src/com/magento/idea/magento2plugin/magento/files/ModelFile.java
+++ b/src/com/magento/idea/magento2plugin/magento/files/ModelFile.java
@@ -5,41 +5,38 @@
 
 package com.magento.idea.magento2plugin.magento.files;
 
-import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
 import org.jetbrains.annotations.NotNull;
 
-public class ModelFile extends AbstractPhpClass {
+public class ModelFile extends AbstractPhpFile {
 
     public static final String ABSTRACT_MODEL =
             "Magento\\Framework\\Model\\AbstractModel";
     public static final String MODEL_DIRECTORY = "Model";
     public static final String TEMPLATE = "Magento Model Class";
+    public static final String HUMAN_READABLE_NAME = "Model class";
     public static final String ALIAS = "Model";
-    private NamespaceBuilder namespaceBuilder;
-
-    public ModelFile(final String className) {
-        super(className);
-    }
 
     /**
-     * Get namespace builder for file.
+     * Model file constructor.
      *
      * @param moduleName String
-     *
-     * @return String
+     * @param className String
      */
-    public @NotNull NamespaceBuilder getNamespaceBuilder(
-            final @NotNull String moduleName
+    public ModelFile(
+            final @NotNull String moduleName,
+            final @NotNull String className
     ) {
-        if (namespaceBuilder == null) {
-            namespaceBuilder = new NamespaceBuilder(
-                    moduleName,
-                    getClassName(),
-                    MODEL_DIRECTORY
-            );
-        }
-
-        return namespaceBuilder;
+        super(moduleName, className);
+    }
+
+    @Override
+    public String getDirectory() {
+        return MODEL_DIRECTORY;
+    }
+
+    @Override
+    public String getHumanReadableName() {
+        return HUMAN_READABLE_NAME;
     }
 
     @Override
diff --git a/src/com/magento/idea/magento2plugin/magento/files/ModuleEventsXml.java b/src/com/magento/idea/magento2plugin/magento/files/ModuleEventsXml.java
index ee87f3d6a..81df22cff 100644
--- a/src/com/magento/idea/magento2plugin/magento/files/ModuleEventsXml.java
+++ b/src/com/magento/idea/magento2plugin/magento/files/ModuleEventsXml.java
@@ -19,6 +19,10 @@ public class ModuleEventsXml implements ModuleFileInterface {
     public static final String OBSERVER_TAG = "observer";
     public static final String INSTANCE_ATTRIBUTE = "instance";
     public static final String EVENT_TAG = "event";
+    public static final String MODULE_TAG = "module";
+
+    //attributes
+    public static final String NAME_ATTRIBUTE = "name";
 
     private static final ModuleEventsXml INSTANCE = new ModuleEventsXml();
 
diff --git a/src/com/magento/idea/magento2plugin/magento/files/ModuleXml.java b/src/com/magento/idea/magento2plugin/magento/files/ModuleXml.java
index 7cbd98fd1..916b39181 100644
--- a/src/com/magento/idea/magento2plugin/magento/files/ModuleXml.java
+++ b/src/com/magento/idea/magento2plugin/magento/files/ModuleXml.java
@@ -12,6 +12,7 @@ public class ModuleXml implements ModuleFileInterface {
     public static final String FILE_NAME = "module.xml";
     public static final String MODULE_ATTR_NAME = "name";
     public static final String TEMPLATE = "Magento Module XML";
+    public static final String NO_SEQUENCES_LABEL = "None";
     private static final ModuleXml INSTANCE = new ModuleXml();
 
     /**
diff --git a/src/com/magento/idea/magento2plugin/magento/files/ResourceModelFile.java b/src/com/magento/idea/magento2plugin/magento/files/ResourceModelFile.java
index 9ab7309b1..6e22e1277 100644
--- a/src/com/magento/idea/magento2plugin/magento/files/ResourceModelFile.java
+++ b/src/com/magento/idea/magento2plugin/magento/files/ResourceModelFile.java
@@ -5,40 +5,38 @@
 
 package com.magento.idea.magento2plugin.magento.files;
 
-import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
 import org.jetbrains.annotations.NotNull;
 
-public class ResourceModelFile extends AbstractPhpClass {
+public class ResourceModelFile extends AbstractPhpFile {
+
     public static final String RESOURCE_MODEL_DIRECTORY = "Model/ResourceModel";
     public static final String TEMPLATE = "Magento Resource Model Class";
+    public static final String HUMAN_READABLE_NAME = "Resource model class";
     public static final String ABSTRACT_DB
             = "Magento\\Framework\\Model\\ResourceModel\\Db\\AbstractDb";
     public static final String ALIAS = "ResourceModel";
-    private NamespaceBuilder namespaceBuilder;
-
-    public ResourceModelFile(final @NotNull String className) {
-        super(className);
-    }
 
     /**
-     * Get namespace builder for file.
+     * Resource model file constructor.
      *
      * @param moduleName String
-     *
-     * @return String
+     * @param className String
      */
-    public @NotNull NamespaceBuilder getNamespaceBuilder(
-            final @NotNull String moduleName
+    public ResourceModelFile(
+            final @NotNull String moduleName,
+            final @NotNull String className
     ) {
-        if (namespaceBuilder == null) {
-            namespaceBuilder = new NamespaceBuilder(
-                    moduleName,
-                    getClassName(),
-                    RESOURCE_MODEL_DIRECTORY
-            );
-        }
-
-        return namespaceBuilder;
+        super(moduleName, className);
+    }
+
+    @Override
+    public String getDirectory() {
+        return RESOURCE_MODEL_DIRECTORY;
+    }
+
+    @Override
+    public String getHumanReadableName() {
+        return HUMAN_READABLE_NAME;
     }
 
     @Override
diff --git a/src/com/magento/idea/magento2plugin/magento/files/UiComponentDataProviderFile.java b/src/com/magento/idea/magento2plugin/magento/files/UiComponentDataProviderFile.java
index dc4627da1..24f65095d 100644
--- a/src/com/magento/idea/magento2plugin/magento/files/UiComponentDataProviderFile.java
+++ b/src/com/magento/idea/magento2plugin/magento/files/UiComponentDataProviderFile.java
@@ -7,12 +7,12 @@
 
 import com.intellij.lang.Language;
 import com.jetbrains.php.lang.PhpLanguage;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
 import org.jetbrains.annotations.NotNull;
 
-public class UiComponentDataProviderFile implements ModuleFileInterface {
+public class UiComponentDataProviderFile extends AbstractPhpFile {
 
     public static final String TEMPLATE = "Magento UI Component Custom Data Provider Class";
+    public static final String HUMAN_READABLE_NAME = "Data Provider Class";
     public static final String DIRECTORY = "Ui/DataProvider";
     public static final String FILE_EXTENSION = "php";
     public static final String CUSTOM_TYPE = "custom";
@@ -21,44 +21,37 @@ public class UiComponentDataProviderFile implements ModuleFileInterface {
             "Magento\\Framework\\View\\Element\\UiComponent\\DataProvider\\DataProvider";
     public static final String SEARCH_RESULT_FACTORY =
             "Magento\\Ui\\DataProvider\\SearchResultFactory";
-    private final String className;
-    private NamespaceBuilder namespaceBuilder;
+    private final String directory;
 
     /**
      * Ui Component data provider file constructor.
      *
-     * @param className String
-     */
-    public UiComponentDataProviderFile(final @NotNull String className) {
-        this.className = className;
-    }
-
-    /**
-     * Get namespace builder for file.
-     *
      * @param moduleName String
+     * @param className String
      * @param directory String
-     *
-     * @return String
      */
-    public @NotNull NamespaceBuilder getNamespaceBuilder(
+    public UiComponentDataProviderFile(
             final @NotNull String moduleName,
+            final @NotNull String className,
             final String directory
     ) {
-        if (namespaceBuilder == null) {
-            namespaceBuilder = new NamespaceBuilder(
-                    moduleName,
-                    className,
-                    directory == null ? DIRECTORY : directory
-            );
-        }
+        super(moduleName, className);
+        this.directory = directory;
+    }
+
+    @Override
+    public String getHumanReadableName() {
+        return HUMAN_READABLE_NAME;
+    }
 
-        return namespaceBuilder;
+    @Override
+    public String getDirectory() {
+        return directory == null ? DIRECTORY : directory;
     }
 
     @Override
     public String getFileName() {
-        return String.format("%s.%s", className, FILE_EXTENSION);
+        return String.format("%s.%s", getClassName(), FILE_EXTENSION);
     }
 
     @Override
diff --git a/src/com/magento/idea/magento2plugin/magento/files/actions/DeleteActionFile.java b/src/com/magento/idea/magento2plugin/magento/files/actions/DeleteActionFile.java
index 90317408a..48be38338 100644
--- a/src/com/magento/idea/magento2plugin/magento/files/actions/DeleteActionFile.java
+++ b/src/com/magento/idea/magento2plugin/magento/files/actions/DeleteActionFile.java
@@ -7,47 +7,30 @@
 
 import com.intellij.lang.Language;
 import com.jetbrains.php.lang.PhpLanguage;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
-import com.magento.idea.magento2plugin.magento.files.ModuleFileInterface;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
 import org.jetbrains.annotations.NotNull;
 
-public final class DeleteActionFile implements ModuleFileInterface {
+public final class DeleteActionFile extends AbstractPhpFile {
 
     public static final String CLASS_NAME = "Delete";
+    public static final String HUMAN_READABLE_NAME = "Delete controller class";
     public static final String FILE_EXTENSION = "php";
     public static final String TEMPLATE = "Magento Entity Delete Controller Class";
     private static final String DIRECTORY = "Controller/Adminhtml";
     private final String entityName;
-    private NamespaceBuilder namespaceBuilder;
 
     /**
      * Delete action file constructor.
      *
-     * @param entityName String
-     */
-    public DeleteActionFile(final @NotNull String entityName) {
-        this.entityName = entityName;
-    }
-
-    /**
-     * Get namespace builder for file.
-     *
      * @param moduleName String
-     *
-     * @return String
+     * @param entityName String
      */
-    public @NotNull NamespaceBuilder getNamespaceBuilder(
-            final @NotNull String moduleName
+    public DeleteActionFile(
+            final @NotNull String moduleName,
+            final @NotNull String entityName
     ) {
-        if (namespaceBuilder == null) {
-            namespaceBuilder = new NamespaceBuilder(
-                    moduleName,
-                    CLASS_NAME,
-                    getDirectory()
-            );
-        }
-
-        return namespaceBuilder;
+        super(moduleName, CLASS_NAME);
+        this.entityName = entityName;
     }
 
     /**
@@ -55,10 +38,16 @@ public DeleteActionFile(final @NotNull String entityName) {
      *
      * @return String
      */
+    @Override
     public String getDirectory() {
         return DIRECTORY.concat("/" + entityName);
     }
 
+    @Override
+    public String getHumanReadableName() {
+        return HUMAN_READABLE_NAME;
+    }
+
     @Override
     public String getFileName() {
         return CLASS_NAME.concat("." + FILE_EXTENSION);
diff --git a/src/com/magento/idea/magento2plugin/magento/files/actions/NewActionFile.java b/src/com/magento/idea/magento2plugin/magento/files/actions/NewActionFile.java
index 534ab6abd..211950548 100644
--- a/src/com/magento/idea/magento2plugin/magento/files/actions/NewActionFile.java
+++ b/src/com/magento/idea/magento2plugin/magento/files/actions/NewActionFile.java
@@ -7,56 +7,42 @@
 
 import com.intellij.lang.Language;
 import com.jetbrains.php.lang.PhpLanguage;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
-import com.magento.idea.magento2plugin.magento.files.ModuleFileInterface;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
 import org.jetbrains.annotations.NotNull;
 
-public final class NewActionFile implements ModuleFileInterface {
+public final class NewActionFile extends AbstractPhpFile {
+
     public static final String CLASS_NAME = "NewAction";
+    public static final String HUMAN_READABLE_NAME = "New entity controller class";
     public static final String FILE_EXTENSION = "php";
     public static final String TEMPLATE = "Magento Entity New Action Controller Class";
     private static final String DIRECTORY = "Controller/Adminhtml";
-    private static final NewActionFile INSTANCE = new NewActionFile();
-
-    /**
-     * Get singleton instance of the class.
-     *
-     * @return NewAction
-     */
-    public static NewActionFile getInstance() {
-        return INSTANCE;
-    }
+    private final String entityName;
 
     /**
-     * Get namespace builder for file.
+     * New action file constructor.
      *
      * @param moduleName String
      * @param entityName String
-     *
-     * @return String
      */
-    public static @NotNull NamespaceBuilder getNamespaceBuilder(
+    public NewActionFile(
             final @NotNull String moduleName,
             final @NotNull String entityName
     ) {
-        return new NamespaceBuilder(
-                moduleName,
-                CLASS_NAME,
-                getDirectory(entityName)
-        );
+        super(moduleName, CLASS_NAME);
+        this.entityName = entityName;
     }
 
-    /**
-     * Get Directory path from the module root.
-     *
-     * @param entityName String
-     *
-     * @return String
-     */
-    public static String getDirectory(final @NotNull String entityName) {
+    @Override
+    public String getDirectory() {
         return DIRECTORY.concat("/" + entityName);
     }
 
+    @Override
+    public String getHumanReadableName() {
+        return HUMAN_READABLE_NAME;
+    }
+
     @Override
     public String getFileName() {
         return CLASS_NAME.concat("." + FILE_EXTENSION);
diff --git a/src/com/magento/idea/magento2plugin/magento/files/commands/SaveEntityCommandFile.java b/src/com/magento/idea/magento2plugin/magento/files/commands/SaveEntityCommandFile.java
index 3dae5c809..61573a503 100644
--- a/src/com/magento/idea/magento2plugin/magento/files/commands/SaveEntityCommandFile.java
+++ b/src/com/magento/idea/magento2plugin/magento/files/commands/SaveEntityCommandFile.java
@@ -5,75 +5,30 @@
 
 package com.magento.idea.magento2plugin.magento.files.commands;
 
-import com.intellij.lang.Language;
-import com.jetbrains.php.lang.PhpLanguage;
-import com.magento.idea.magento2plugin.actions.generation.generator.util.NamespaceBuilder;
+import com.magento.idea.magento2plugin.magento.files.AbstractPhpFile;
 import com.magento.idea.magento2plugin.magento.files.ModuleFileInterface;
 import org.jetbrains.annotations.NotNull;
 
-public class SaveEntityCommandFile implements ModuleFileInterface {
+public class SaveEntityCommandFile extends AbstractPhpFile implements ModuleFileInterface {
 
     public static final String CLASS_NAME = "SaveCommand";
-    public static final String FILE_EXTENSION = "php";
     public static final String TEMPLATE = "Magento Save Entity Command Model";
+    public static final String HUMAN_READABLE_NAME = "Save entity command model";
     private static final String DIRECTORY = "Command";
     private final String entityName;
-    private NamespaceBuilder namespaceBuilder;
 
     /**
      * Save entity command file constructor.
      *
-     * @param entityName String
-     */
-    public SaveEntityCommandFile(final @NotNull String entityName) {
-        this.entityName = entityName;
-    }
-
-    /**
-     * Get namespace.
-     *
-     * @param moduleName String
-     *
-     * @return String
-     */
-    public @NotNull String getNamespace(
-            final @NotNull String moduleName
-    ) {
-        return getNamespaceBuilder(moduleName).getNamespace();
-    }
-
-    /**
-     * Get class FQN.
-     *
-     * @param moduleName String
-     *
-     * @return String
-     */
-    public String getClassFqn(
-            final @NotNull String moduleName
-    ) {
-        return getNamespaceBuilder(moduleName).getClassFqn();
-    }
-
-    /**
-     * Get namespace builder for file.
-     *
      * @param moduleName String
-     *
-     * @return String
+     * @param entityName String
      */
-    public @NotNull NamespaceBuilder getNamespaceBuilder(
-            final @NotNull String moduleName
+    public SaveEntityCommandFile(
+            final @NotNull String moduleName,
+            final @NotNull String entityName
     ) {
-        if (namespaceBuilder == null) {
-            namespaceBuilder = new NamespaceBuilder(
-                    moduleName,
-                    CLASS_NAME,
-                    getDirectory()
-            );
-        }
-
-        return namespaceBuilder;
+        super(moduleName, CLASS_NAME);
+        this.entityName = entityName;
     }
 
     /**
@@ -81,22 +36,18 @@ public String getClassFqn(
      *
      * @return String
      */
+    @Override
     public String getDirectory() {
         return DIRECTORY.concat("/" + entityName);
     }
 
     @Override
-    public String getFileName() {
-        return CLASS_NAME.concat("." + FILE_EXTENSION);
+    public String getHumanReadableName() {
+        return HUMAN_READABLE_NAME;
     }
 
     @Override
     public String getTemplate() {
         return TEMPLATE;
     }
-
-    @Override
-    public Language getLanguage() {
-        return PhpLanguage.INSTANCE;
-    }
 }
diff --git a/src/com/magento/idea/magento2plugin/magento/packages/Package.java b/src/com/magento/idea/magento2plugin/magento/packages/Package.java
index 205a456d3..dcd91eeec 100644
--- a/src/com/magento/idea/magento2plugin/magento/packages/Package.java
+++ b/src/com/magento/idea/magento2plugin/magento/packages/Package.java
@@ -12,6 +12,7 @@ public class Package { //NOPMD
     public static String frameworkRootGit = "lib/internal/Magento/Framework";
     public static String vendor = "vendor";
     public static String moduleBaseAreaDir = "etc";
+    public static String moduleViewEmailDir = "email";
     public static String moduleViewDir = "view";
     public static String moduleViewUiComponentDir = "ui_component";
     public static String vendorModuleNameSeparator = "_";
diff --git a/src/com/magento/idea/magento2plugin/reference/provider/EventDispatchReferenceProvider.java b/src/com/magento/idea/magento2plugin/reference/provider/EventDispatchReferenceProvider.java
index 59ee575af..dc1d5a292 100644
--- a/src/com/magento/idea/magento2plugin/reference/provider/EventDispatchReferenceProvider.java
+++ b/src/com/magento/idea/magento2plugin/reference/provider/EventDispatchReferenceProvider.java
@@ -29,7 +29,7 @@ public PsiReference[] getReferencesByElement(
     ) {
         final String value = StringUtil.unquoteString(element.getText());
         final List<PsiReference> psiReferences = new ArrayList<>();
-        final Collection<PsiElement> targets = EventIndex.getInstance(element.getProject())
+        final Collection<PsiElement> targets = new EventIndex(element.getProject())
                 .getEventElements(
                         value,
                         GlobalSearchScope.getScopeRestrictedByFileTypes(
diff --git a/src/com/magento/idea/magento2plugin/reference/provider/ObserverNameReferenceProvider.java b/src/com/magento/idea/magento2plugin/reference/provider/ObserverNameReferenceProvider.java
new file mode 100644
index 000000000..94e34c555
--- /dev/null
+++ b/src/com/magento/idea/magento2plugin/reference/provider/ObserverNameReferenceProvider.java
@@ -0,0 +1,43 @@
+package com.magento.idea.magento2plugin.reference.provider;
+
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.PsiReferenceProvider;
+import com.intellij.psi.impl.source.xml.XmlAttributeValueImpl;
+import com.intellij.psi.impl.source.xml.XmlTagImpl;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.util.ProcessingContext;
+import com.magento.idea.magento2plugin.indexes.EventIndex;
+import com.magento.idea.magento2plugin.reference.xml.PolyVariantReferenceBase;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.jetbrains.annotations.NotNull;
+
+public class ObserverNameReferenceProvider extends PsiReferenceProvider {
+    @Override
+    public PsiReference @NotNull [] getReferencesByElement(
+            @NotNull final PsiElement element,
+            @NotNull final ProcessingContext context
+    ) {
+        final List<PsiReference> psiReferences = new ArrayList<>();
+        final XmlTagImpl eventTag = (XmlTagImpl) element.getParent().getParent().getParent();
+        final String eventName = eventTag.getAttributeValue("name");
+
+        if (eventName == null) {
+            return psiReferences.toArray(new PsiReference[0]);
+        }
+
+        final String observerName = ((XmlAttributeValueImpl) element).getValue();
+        final Collection<PsiElement> observers
+                = new EventIndex(element.getProject()).getObservers(
+                        eventName, observerName, GlobalSearchScope.allScope(element.getProject())
+                );
+
+        if (!observers.isEmpty()) {
+            psiReferences.add(new PolyVariantReferenceBase(element, observers));
+        }
+
+        return psiReferences.toArray(new PsiReference[0]);
+    }
+}
diff --git a/src/com/magento/idea/magento2plugin/reference/provider/PhpClassReferenceProvider.java b/src/com/magento/idea/magento2plugin/reference/provider/PhpClassReferenceProvider.java
index 0e87e3d93..39618e545 100644
--- a/src/com/magento/idea/magento2plugin/reference/provider/PhpClassReferenceProvider.java
+++ b/src/com/magento/idea/magento2plugin/reference/provider/PhpClassReferenceProvider.java
@@ -1,7 +1,8 @@
-/**
+/*
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.reference.provider;
 
 import com.intellij.openapi.util.TextRange;
@@ -14,60 +15,69 @@
 import com.jetbrains.php.lang.psi.elements.PhpNamespace;
 import com.magento.idea.magento2plugin.reference.xml.PolyVariantReferenceBase;
 import com.magento.idea.magento2plugin.util.RegExUtil;
-import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.jetbrains.annotations.NotNull;
 
+@SuppressWarnings({"PMD.AvoidInstantiatingObjectsInLoops"})
 public class PhpClassReferenceProvider extends PsiReferenceProvider {
 
     @NotNull
     @Override
-    public PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
-        List<PsiReference> psiReferences = new ArrayList<>();
+    public PsiReference[] getReferencesByElement(
+            final @NotNull PsiElement element,
+            final @NotNull ProcessingContext context
+    ) {
 
-        String origValue = element.getText();
+        final String origValue = element.getText();
 
-        Pattern pattern = Pattern.compile(RegExUtil.PhpRegex.FQN);
-        Matcher matcher = pattern.matcher(origValue);
+        final Pattern pattern = Pattern.compile(RegExUtil.PhpRegex.FQN);
+        final Matcher matcher = pattern.matcher(origValue);
         if (!matcher.find()) {
             return PsiReference.EMPTY_ARRAY;
         }
 
-        String classFQN = matcher.group();
-        String[] fqnParts = classFQN.split("\\\\");
+        final String classFQN = origValue.replaceAll("^\"|\"$", "");
+        final String[] fqnParts = classFQN.split("\\\\");
 
-        PhpIndex phpIndex = PhpIndex.getInstance(element.getProject());
+        final PhpIndex phpIndex = PhpIndex.getInstance(element.getProject());
 
-        StringBuilder namespace = new StringBuilder();
+        final StringBuilder namespace = new StringBuilder();
         String namespacePart;
+        final List<PsiReference> psiReferences = new ArrayList<>();
         for (int i = 0; i < fqnParts.length - 1; i++) {
             namespacePart = fqnParts[i];
 
-            namespace.append("\\");
-            namespace.append(namespacePart);
-            Collection<PhpNamespace> references = phpIndex.getNamespacesByName(namespace.toString().toLowerCase());
-            if (references.size() > 0) {
-                TextRange range = new TextRange(
+            namespace.append("\\");//NOPMD
+            namespace.append(namespacePart);//NOPMD
+            final Collection<PhpNamespace> references =
+                    phpIndex.getNamespacesByName(namespace.toString().toLowerCase(
+                            new Locale("en","EN"))
+                    );
+            if (!references.isEmpty()) {
+                final TextRange range = new TextRange(
                         origValue.indexOf(classFQN) + namespace.toString().lastIndexOf(92),
-                        origValue.indexOf(classFQN) + namespace.toString().lastIndexOf(92) + namespacePart.length()
+                        origValue.indexOf(classFQN) + namespace.toString().lastIndexOf(92)
+                                + namespacePart.length()
                 );
                 psiReferences.add(new PolyVariantReferenceBase(element, range, references));
             }
         }
 
-        String className = classFQN.substring(classFQN.lastIndexOf(92) + 1);
-        Collection<PhpClass> classes = phpIndex.getAnyByFQN(classFQN);
-        if (classes.size() > 0) {
-            TextRange range = new TextRange(
+        final String className = classFQN.substring(classFQN.lastIndexOf(92) + 1);
+        final Collection<PhpClass> classes = phpIndex.getAnyByFQN(classFQN);
+        if (!classes.isEmpty()) {
+            final TextRange range = new TextRange(
                     origValue.lastIndexOf(92) + 1,
                     origValue.lastIndexOf(92) + 1 + className.length()
             );
             psiReferences.add(new PolyVariantReferenceBase(element, range, classes));
         }
 
-        return psiReferences.toArray(new PsiReference[psiReferences.size()]);
+        return psiReferences.toArray(new PsiReference[0]);
     }
 }
diff --git a/src/com/magento/idea/magento2plugin/reference/xml/XmlReferenceContributor.java b/src/com/magento/idea/magento2plugin/reference/xml/XmlReferenceContributor.java
index e255e8704..e1eb7471a 100644
--- a/src/com/magento/idea/magento2plugin/reference/xml/XmlReferenceContributor.java
+++ b/src/com/magento/idea/magento2plugin/reference/xml/XmlReferenceContributor.java
@@ -153,6 +153,16 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar)
             new EventNameReferenceProvider()
         );
 
+        // <observer name="reference" />
+        registrar.registerReferenceProvider(
+                XmlPatterns.xmlAttributeValue().withParent(
+                        XmlPatterns.xmlAttribute().withName("name").withParent(
+                                XmlPatterns.xmlTag().withName("observer")
+                        )
+                ),
+                new ObserverNameReferenceProvider()
+        );
+
         // <someXmlTag someAttribute="Module_Name[.*]" />
         registrar.registerReferenceProvider(
             XmlPatterns.xmlAttributeValue().withValue(string().matches(".*[A-Z][a-zA-Z0-9]+_[A-Z][a-zA-Z0-9]+.*")),
diff --git a/src/com/magento/idea/magento2plugin/util/RegExUtil.java b/src/com/magento/idea/magento2plugin/util/RegExUtil.java
index d4a66c3f3..d815864b7 100644
--- a/src/com/magento/idea/magento2plugin/util/RegExUtil.java
+++ b/src/com/magento/idea/magento2plugin/util/RegExUtil.java
@@ -73,7 +73,7 @@ public static class Magento {
     public class PhpRegex {
 
         public static final String CLASS_NAME
-                = "[A-Z][a-zA-Z0-9_\\x7f-\\xff]*";
+                = "[a-zA-Z0-9_\\x7f-\\xff]*";
 
         public static final String FQN
                 = CLASS_NAME + "(\\\\" + CLASS_NAME + ")*";
@@ -87,4 +87,9 @@ public static class XmlRegex {
         public static final String CLASS_ELEMENT =
                 "\\\\?" + PhpRegex.FQN + "(" + CLASS_MEMBER_NAME + ")?.*";
     }
+
+    public static class CustomTheme {
+        public static final String MODULE_NAME =
+                "app\\/design\\/(adminhtml|frontend)\\/\\w*\\/\\w*\\/\\w*";
+    }
 }
diff --git a/src/com/magento/idea/magento2plugin/util/magento/GetModuleNameByDirectoryUtil.java b/src/com/magento/idea/magento2plugin/util/magento/GetModuleNameByDirectoryUtil.java
index 63e711223..84b9c1ec3 100644
--- a/src/com/magento/idea/magento2plugin/util/magento/GetModuleNameByDirectoryUtil.java
+++ b/src/com/magento/idea/magento2plugin/util/magento/GetModuleNameByDirectoryUtil.java
@@ -14,11 +14,11 @@
 import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
 import com.magento.idea.magento2plugin.magento.files.RegistrationPhp;
 import com.magento.idea.magento2plugin.util.RegExUtil;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.jetbrains.annotations.Nullable;
 
 public final class GetModuleNameByDirectoryUtil {
-    public static final int THEME_SPLIT_COUNT = 1;
-    public static final String THEME_DIRECTORY_REGEX = "app\\/design\\/(adminhtml|frontend)\\/";
 
     private GetModuleNameByDirectoryUtil() {}
 
@@ -34,10 +34,14 @@ public static String execute(
             final Project project
     ) {
         // Check if directory is theme directory and return module name from directory path if yes
-        final String[] splits = psiDirectory.getVirtualFile().getPath()
-                .split(THEME_DIRECTORY_REGEX);
-        if (splits.length > THEME_SPLIT_COUNT) {
-            return splits[1].split("\\/")[2];
+        final String path = psiDirectory.getVirtualFile().getPath();
+        final Pattern pattern = Pattern.compile(RegExUtil.CustomTheme.MODULE_NAME);
+        final Matcher matcher = pattern.matcher(path);
+        while (matcher.find()) {
+            final String moduleNamePath =  matcher.group(0);
+            if (!moduleNamePath.isEmpty()) {
+                return moduleNamePath.split("/")[5];
+            }
         }
 
         final PhpFile registrationPhp = getRegistrationPhpRecursively(
diff --git a/src/com/magento/idea/magento2plugin/util/xml/XmlPsiTreeUtil.java b/src/com/magento/idea/magento2plugin/util/xml/XmlPsiTreeUtil.java
index 870c823fd..8e3273a90 100644
--- a/src/com/magento/idea/magento2plugin/util/xml/XmlPsiTreeUtil.java
+++ b/src/com/magento/idea/magento2plugin/util/xml/XmlPsiTreeUtil.java
@@ -29,6 +29,10 @@
         "PMD.UseObjectForClearerAPI"
 })
 public class XmlPsiTreeUtil {
+    public static final String EVENT_TAG_NAME = "event";
+    public static final String OBSERVER_TAG_NAME = "observer";
+    public static final String NAME_ATTRIBUTE = "name";
+
     /**
      * Get type tag of an argument.
      *
@@ -47,6 +51,52 @@ public static XmlTag getTypeTagOfArgument(final XmlElement psiArgumentValueEleme
         return PsiTreeUtil.getParentOfType(argumentsTag, XmlTag.class);
     }
 
+    /**
+     * Finds observer tags by event-observer name combination.
+     */
+    @SuppressWarnings({
+            "PMD.CyclomaticComplexity"
+    })
+    public static Collection<XmlAttributeValue> findObserverTags(
+            final XmlFile xmlFile,
+            final String eventName,
+            final String observerName
+    ) {
+        Collection<XmlAttributeValue> psiElements = new THashSet<>();
+        final XmlTag configTag = xmlFile.getRootTag();
+
+        if (configTag == null) {
+            return psiElements;
+        }
+
+        /* Loop through event tags */
+        for (XmlTag eventTag: configTag.getSubTags()) {
+            XmlAttribute eventNameAttribute = eventTag.getAttribute(NAME_ATTRIBUTE);
+
+            /* Check if event tag and name matches */
+            if (EVENT_TAG_NAME.equals(eventTag.getName())
+                    && eventNameAttribute != null
+                    && eventName.equals(eventNameAttribute.getValue())
+            ) {
+                /* Loop through observer tags under matched event tag */
+                for (XmlTag observerTag: eventTag.getSubTags()) {
+                    XmlAttribute observerNameAttribute = observerTag.getAttribute(NAME_ATTRIBUTE);
+
+                    /* Check if observer tag and name matches */
+                    if (OBSERVER_TAG_NAME.equals(observerTag.getName())
+                            && observerNameAttribute != null
+                            && observerNameAttribute.getValueElement() != null
+                            && observerName.equals(observerNameAttribute.getValue())
+                    ) {
+                        psiElements.add(observerNameAttribute.getValueElement());
+                    }
+                }
+            }
+        }
+
+        return psiElements;
+    }
+
     /**
      * Find attribute value elements based on the tag name.
      *
diff --git a/testData/actions/generation/generator/ModuleEmailTemplateHtmlGenerator/generateEmailTemplateHtml/custom_email_template_html.html b/testData/actions/generation/generator/ModuleEmailTemplateHtmlGenerator/generateEmailTemplateHtml/custom_email_template_html.html
new file mode 100644
index 000000000..bee3e775e
--- /dev/null
+++ b/testData/actions/generation/generator/ModuleEmailTemplateHtmlGenerator/generateEmailTemplateHtml/custom_email_template_html.html
@@ -0,0 +1,6 @@
+<!--@subject {{trans "HTML Email Template Subject"}} @-->
+<!--@vars {} @-->
+
+{{template config_path="design/email/header_template"}}
+<!-- @todo: implement html template -->
+{{template config_path="design/email/footer_template"}}
\ No newline at end of file
diff --git a/testData/actions/generation/generator/ModuleEmailTemplateHtmlGenerator/generateEmailTemplateText/custom_email_template_text.html b/testData/actions/generation/generator/ModuleEmailTemplateHtmlGenerator/generateEmailTemplateText/custom_email_template_text.html
new file mode 100644
index 000000000..7dbf3a87c
--- /dev/null
+++ b/testData/actions/generation/generator/ModuleEmailTemplateHtmlGenerator/generateEmailTemplateText/custom_email_template_text.html
@@ -0,0 +1,5 @@
+<!--@subject {{trans "TEXT Email Template Subject"}} @-->
+<!--@vars {} @-->
+
+
+<!-- @todo: implement text template -->
diff --git a/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/addTwoEmailTemplatesToEmailTemplatesXmlFile/email_templates.xml b/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/addTwoEmailTemplatesToEmailTemplatesXmlFile/email_templates.xml
new file mode 100644
index 000000000..4bcb42774
--- /dev/null
+++ b/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/addTwoEmailTemplatesToEmailTemplatesXmlFile/email_templates.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
+    <template id="custom_email_template_html" label="Custom Email Template HTML" file="custom_email_template_html.html"
+              type="html" module="Foo_Bar" area="adminhtml"/>
+    <template id="custom_email_template_text" label="Custom Email Template TEXT" file="custom_email_template_text.html"
+              type="text" module="Foo_Bar" area="frontend"/>
+</config>
diff --git a/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/generateEmailTemplateHtmlXml/email_templates.xml b/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/generateEmailTemplateHtmlXml/email_templates.xml
new file mode 100644
index 000000000..690a51a01
--- /dev/null
+++ b/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/generateEmailTemplateHtmlXml/email_templates.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
+    <template id="custom_email_template_html" label="Custom Email Template HTML" file="custom_email_template_html.html"
+              type="html" module="Foo_Bar" area="adminhtml"/>
+</config>
diff --git a/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/generateEmailTemplateTextXml/email_templates.xml b/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/generateEmailTemplateTextXml/email_templates.xml
new file mode 100644
index 000000000..9682ba2f0
--- /dev/null
+++ b/testData/actions/generation/generator/ModuleEmailTemplatesXmlGenerator/generateEmailTemplateTextXml/email_templates.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
+    <template id="custom_email_template_text" label="Custom Email Template TEXT" file="custom_email_template_text.html"
+              type="text" module="Foo_Bar" area="frontend"/>
+</config>
diff --git a/testData/actions/generation/generator/ModuleXmlGenerator/generateFileInRoot/module.xml b/testData/actions/generation/generator/ModuleXmlGenerator/generateFileInRoot/module.xml
index 1bb7ffdf1..9a3a1c6e4 100644
--- a/testData/actions/generation/generator/ModuleXmlGenerator/generateFileInRoot/module.xml
+++ b/testData/actions/generation/generator/ModuleXmlGenerator/generateFileInRoot/module.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Test_Module"/>
+    <module name="Test_Module">
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_InventoryApi"/>
+        </sequence>
+    </module>
 </config>
diff --git a/testData/actions/generation/generator/ModuleXmlGenerator/generateModuleFile/module.xml b/testData/actions/generation/generator/ModuleXmlGenerator/generateModuleFile/module.xml
index 1bb7ffdf1..9a3a1c6e4 100644
--- a/testData/actions/generation/generator/ModuleXmlGenerator/generateModuleFile/module.xml
+++ b/testData/actions/generation/generator/ModuleXmlGenerator/generateModuleFile/module.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Test_Module"/>
+    <module name="Test_Module">
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_InventoryApi"/>
+        </sequence>
+    </module>
 </config>
diff --git a/testData/actions/generation/generator/ModuleXmlGeneratorHaveSetupVersion/generateModuleFile/module.xml b/testData/actions/generation/generator/ModuleXmlGeneratorHaveSetupVersion/generateModuleFile/module.xml
index 9a16123f5..abb1815af 100644
--- a/testData/actions/generation/generator/ModuleXmlGeneratorHaveSetupVersion/generateModuleFile/module.xml
+++ b/testData/actions/generation/generator/ModuleXmlGeneratorHaveSetupVersion/generateModuleFile/module.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Test_Module1" setup_version="1.0.0"/>
+    <module name="Test_Module1" setup_version="1.0.0">
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_InventoryApi"/>
+        </sequence>
+    </module>
 </config>
diff --git a/testData/inspections/xml/ModuleDeclarationInModuleXmlInspection/setupVersionNotErrorMessageInEditableModule/app/code/Test/TestModule/etc/module.xml b/testData/inspections/xml/ModuleDeclarationInModuleXmlInspection/setupVersionNotErrorMessageInEditableModule/app/code/Test/TestModule/etc/module.xml
new file mode 100644
index 000000000..096ec0b14
--- /dev/null
+++ b/testData/inspections/xml/ModuleDeclarationInModuleXmlInspection/setupVersionNotErrorMessageInEditableModule/app/code/Test/TestModule/etc/module.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Test_TestModule" setup_version="1.0.0" />
+</config>
diff --git a/testData/project/magento2/vendor/magento/module-catalog/etc/events.xml b/testData/project/magento2/vendor/magento/module-catalog/etc/events.xml
index aa2f68cd4..992a5dcde 100644
--- a/testData/project/magento2/vendor/magento/module-catalog/etc/events.xml
+++ b/testData/project/magento2/vendor/magento/module-catalog/etc/events.xml
@@ -5,8 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="test_event_in_test_class">
         <observer name="test_observer" instance="Magento\Catalog\Observer\TestObserver" />
     </event>
diff --git a/testData/project/magento2/vendor/magento/module-catalog/test_event/TestObserver.php b/testData/project/magento2/vendor/magento/module-catalog/test_event/TestObserver.php
new file mode 100644
index 000000000..e8d015322
--- /dev/null
+++ b/testData/project/magento2/vendor/magento/module-catalog/test_event/TestObserver.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\test_event;
+
+use Magento\Framework\Event\ObserverInterface;
+
+class TestObserver implements ObserverInterface
+{
+    public function execute()
+    {
+    }
+}
diff --git a/testData/reference/xml/ObserverReferenceRegistrar/observerInstanceDirectorySnakeCaseMustHaveReference/events.xml b/testData/reference/xml/ObserverReferenceRegistrar/observerInstanceDirectorySnakeCaseMustHaveReference/events.xml
new file mode 100644
index 000000000..783277ba3
--- /dev/null
+++ b/testData/reference/xml/ObserverReferenceRegistrar/observerInstanceDirectorySnakeCaseMustHaveReference/events.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="test_event">
+        <observer name="test_observer" instance="Magento\Catalog\test_event\TestObserver<caret>" />
+    </event>
+</config>
diff --git a/testData/reference/xml/ObserverReferenceRegistrar/observerNameMustHaveReference/events.xml b/testData/reference/xml/ObserverReferenceRegistrar/observerNameMustHaveReference/events.xml
new file mode 100644
index 000000000..a7872e70f
--- /dev/null
+++ b/testData/reference/xml/ObserverReferenceRegistrar/observerNameMustHaveReference/events.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="test_event_in_test_class">
+        <observer name="test_observer<caret>" disabled="true"/>
+    </event>
+</config>
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityGeneratorTest.java
index ca62326ba..892e9dcf7 100644
--- a/tests/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityGeneratorTest.java
+++ b/tests/com/magento/idea/magento2plugin/actions/generation/generator/DeleteEntityGeneratorTest.java
@@ -37,7 +37,7 @@ public void testGenerateDeleteEntityFile() {
         final PsiFile DeleteEntityActionFile =
                 deleteEntityControllerFileGenerator.generate("test");
         final String filePath =
-                this.getFixturePath(new DeleteActionFile(ENTITY_NAME).getFileName());
+                this.getFixturePath(new DeleteActionFile(MODULE_NAME, ENTITY_NAME).getFileName());
         final PsiFile expectedFile = myFixture.configureByFile(filePath);
 
         assertGeneratedFileIsCorrect(
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplateHtmlGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplateHtmlGeneratorTest.java
new file mode 100644
index 000000000..5e5bfa193
--- /dev/null
+++ b/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplateHtmlGeneratorTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.generator;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiFile;
+import com.magento.idea.magento2plugin.actions.generation.data.EmailTemplateHtmlData;
+import com.magento.idea.magento2plugin.magento.files.EmailTemplateHtml;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
+
+public class ModuleEmailTemplateHtmlGeneratorTest extends BaseGeneratorTestCase {
+    private static final String EMAIL_TEMPLATE_DIR = "src/app/code/Foo/Bar/view/%s/email";
+    private static final String MODULE_NAME = "Foo_Bar";
+    private static final String EMAIL_TEMPLATE_FILE_NAME_HTML = "custom_email_template_html";
+    private static final String EMAIL_TEMPLATE_FILE_NAME_TEXT = "custom_email_template_text";
+    private static final String EMAIL_TEMPLATE_SUBJECT_HTML = "HTML Email Template Subject";
+    private static final String EMAIL_TEMPLATE_SUBJECT_TEXT = "TEXT Email Template Subject";
+
+    /**
+     * Test generating email template with HTML type.
+     */
+    public void testGenerateEmailTemplateHtml() {
+        final String filePath = this.getFixturePath(
+                String.format(
+                        "%s.%s",
+                        EMAIL_TEMPLATE_FILE_NAME_HTML,
+                        EmailTemplateHtml.HTML_FILE_EXTENSION
+                )
+        );
+        final String area = Areas.adminhtml.toString();
+        final PsiFile expectedFile = myFixture.configureByFile(filePath);
+        final PsiFile emailTemplateXmlFile = generateEmailTemplateHtml(
+                EMAIL_TEMPLATE_FILE_NAME_HTML,
+                EMAIL_TEMPLATE_SUBJECT_HTML,
+                EmailTemplateHtml.HTML_TYPE,
+                area
+        );
+
+        assertGeneratedFileIsCorrect(
+                expectedFile,
+                getExpectedDirectory(area),
+                emailTemplateXmlFile
+        );
+    }
+
+    /**
+     * Test generating email template with TEXT type.
+     */
+    public void testGenerateEmailTemplateText() {
+        final String filePath = this.getFixturePath(
+                String.format(
+                        "%s.%s",
+                        EMAIL_TEMPLATE_FILE_NAME_TEXT,
+                        EmailTemplateHtml.HTML_FILE_EXTENSION
+                )
+        );
+        final String area = Areas.frontend.toString();
+        final PsiFile expectedFile = myFixture.configureByFile(filePath);
+        final PsiFile emailTemplateXmlFile = generateEmailTemplateHtml(
+                EMAIL_TEMPLATE_FILE_NAME_TEXT,
+                EMAIL_TEMPLATE_SUBJECT_TEXT,
+                EmailTemplateHtml.TEXT_TYPE,
+                area
+        );
+
+        assertGeneratedFileIsCorrect(
+                expectedFile,
+                getExpectedDirectory(area),
+                emailTemplateXmlFile
+        );
+    }
+
+    /**
+     * Generate email template Html file.
+     *
+     * @param filename Email Template Filename
+     * @param subject Email Template Filename
+     * @param type Email Type
+     * @param area Area
+     * @return PsiFile
+     */
+    private PsiFile generateEmailTemplateHtml(
+            final String filename,
+            final String subject,
+            final String type,
+            final String area
+    ) {
+        final Project project = myFixture.getProject();
+        final EmailTemplateHtmlData emailTemplatesData = new EmailTemplateHtmlData(
+                MODULE_NAME,
+                filename,
+                area,
+                subject,
+                type
+        );
+        final ModuleEmailTemplateHtmlGenerator generator = new ModuleEmailTemplateHtmlGenerator(
+                emailTemplatesData,
+                project
+        );
+
+        return generator.generate("test");
+    }
+
+    private String getExpectedDirectory(final String area) {
+        return String.format(EMAIL_TEMPLATE_DIR, area);
+    }
+}
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplatesXmlGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplatesXmlGeneratorTest.java
new file mode 100644
index 000000000..17d82a941
--- /dev/null
+++ b/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleEmailTemplatesXmlGeneratorTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+package com.magento.idea.magento2plugin.actions.generation.generator;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiFile;
+import com.magento.idea.magento2plugin.actions.generation.data.EmailTemplatesXmlData;
+import com.magento.idea.magento2plugin.magento.files.EmailTemplateHtml;
+import com.magento.idea.magento2plugin.magento.files.EmailTemplatesXml;
+import com.magento.idea.magento2plugin.magento.packages.Areas;
+
+public class ModuleEmailTemplatesXmlGeneratorTest extends BaseGeneratorTestCase {
+    private static final String EXPECTED_DIRECTORY = "src/app/code/Foo/Bar/etc";
+    private static final String MODULE_NAME = "Foo_Bar";
+    private static final String EMAIL_TEMPLATE_ID_HTML = "custom_email_template_html";
+    private static final String EMAIL_TEMPLATE_LABEL_HTML = "Custom Email Template HTML";
+    private static final String EMAIL_TEMPLATE_FILE_NAME_HTML = "custom_email_template_html";
+    private static final String EMAIL_TEMPLATE_ID_TEXT = "custom_email_template_text";
+    private static final String EMAIL_TEMPLATE_LABEL_TEXT = "Custom Email Template TEXT";
+    private static final String EMAIL_TEMPLATE_FILE_NAME_TEXT = "custom_email_template_text";
+
+    /**
+     * Test generating email template configuration with HTML type.
+     */
+    public void testGenerateEmailTemplateHtmlXml() {
+        final String filePath = this.getFixturePath(EmailTemplatesXml.FILE_NAME);
+        final PsiFile expectedFile = myFixture.configureByFile(filePath);
+        final PsiFile emailTemplateXmlFile = addEmailTemplateXml(
+                EMAIL_TEMPLATE_ID_HTML,
+                EMAIL_TEMPLATE_LABEL_HTML,
+                EMAIL_TEMPLATE_FILE_NAME_HTML,
+                EmailTemplateHtml.HTML_TYPE,
+                Areas.adminhtml.toString()
+        );
+
+        assertGeneratedFileIsCorrect(expectedFile, EXPECTED_DIRECTORY, emailTemplateXmlFile);
+    }
+
+    /**
+     * Test generating email template configuration with TEXT type.
+     */
+    public void testGenerateEmailTemplateTextXml() {
+        final String filePath = this.getFixturePath(EmailTemplatesXml.FILE_NAME);
+        final PsiFile expectedFile = myFixture.configureByFile(filePath);
+        final PsiFile emailTemplateXmlFile = addEmailTemplateXml(
+                EMAIL_TEMPLATE_ID_TEXT,
+                EMAIL_TEMPLATE_LABEL_TEXT,
+                EMAIL_TEMPLATE_FILE_NAME_TEXT,
+                EmailTemplateHtml.TEXT_TYPE,
+                Areas.frontend.toString()
+        );
+
+        assertGeneratedFileIsCorrect(expectedFile, EXPECTED_DIRECTORY, emailTemplateXmlFile);
+    }
+
+    /**
+     * Test adding two email templates to email_templates.xml.
+     */
+    public void testAddTwoEmailTemplatesToEmailTemplatesXmlFile() {
+        final String filePath = this.getFixturePath(EmailTemplatesXml.FILE_NAME);
+        final PsiFile expectedFile = myFixture.configureByFile(filePath);
+        addEmailTemplateXml(
+                EMAIL_TEMPLATE_ID_HTML,
+                EMAIL_TEMPLATE_LABEL_HTML,
+                EMAIL_TEMPLATE_FILE_NAME_HTML,
+                EmailTemplateHtml.HTML_TYPE,
+                Areas.adminhtml.toString()
+        );
+        final PsiFile emailTemplateXmlFile = addEmailTemplateXml(
+                EMAIL_TEMPLATE_ID_TEXT,
+                EMAIL_TEMPLATE_LABEL_TEXT,
+                EMAIL_TEMPLATE_FILE_NAME_TEXT,
+                EmailTemplateHtml.TEXT_TYPE,
+                Areas.frontend.toString()
+        );
+
+        assertGeneratedFileIsCorrect(expectedFile, EXPECTED_DIRECTORY, emailTemplateXmlFile);
+    }
+
+    /**
+     * Add email template XML.
+     *
+     * @param emailTemplateId Email Template ID
+     * @param label Email Template Label
+     * @param filename Email Template Filename
+     * @param type Email Type
+     * @param area Area
+     * @return PsiFile
+     */
+    private PsiFile addEmailTemplateXml(
+            final String emailTemplateId,
+            final String label,
+            final String filename,
+            final String type,
+            final String area
+    ) {
+        final Project project = myFixture.getProject();
+        final EmailTemplatesXmlData emailTemplatesData = new EmailTemplatesXmlData(
+                MODULE_NAME,
+                emailTemplateId,
+                label,
+                filename,
+                type,
+                area
+        );
+        final ModuleEmailTemplatesXmlGenerator generator = new ModuleEmailTemplatesXmlGenerator(
+                emailTemplatesData,
+                project
+        );
+
+        return generator.generate("test");
+    }
+}
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGeneratorHaveSetupVersionTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGeneratorHaveSetupVersionTest.java
index 04332ca2b..4a0fc2498 100644
--- a/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGeneratorHaveSetupVersionTest.java
+++ b/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGeneratorHaveSetupVersionTest.java
@@ -7,6 +7,7 @@
 import com.magento.idea.magento2plugin.magento.files.ModuleXml;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
+import java.util.Arrays;
 
 public class ModuleXmlGeneratorHaveSetupVersionTest extends BaseGeneratorTestCase {
 
@@ -24,6 +25,7 @@ public void testGenerateModuleFile() {
                 "Module1",
                 "1.0.0",
                 projectDir,
+                Arrays.asList("Magento_Catalog", "Magento_InventoryApi"),
                 true
         );
         final ModuleXmlGenerator moduleXmlGenerator = new ModuleXmlGenerator(
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGeneratorTest.java
index b22397690..bd81f169a 100644
--- a/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGeneratorTest.java
+++ b/tests/com/magento/idea/magento2plugin/actions/generation/generator/ModuleXmlGeneratorTest.java
@@ -12,6 +12,7 @@
 import com.magento.idea.magento2plugin.magento.files.ModuleXml;
 import com.magento.idea.magento2plugin.magento.packages.File;
 import com.magento.idea.magento2plugin.magento.packages.Package;
+import java.util.Arrays;
 
 public class ModuleXmlGeneratorTest extends BaseGeneratorTestCase {
 
@@ -29,6 +30,7 @@ public void testGenerateModuleFile() {
                 "Module",
                 null,
                 projectDir,
+                Arrays.asList("Magento_Catalog", "Magento_InventoryApi"),
                 true
         );
         final ModuleXmlGenerator moduleXmlGenerator = new ModuleXmlGenerator(
@@ -60,6 +62,7 @@ public void testGenerateFileInRoot() {
                 "Module",
                 null,
                 projectDir,
+                Arrays.asList("Magento_Catalog", "Magento_InventoryApi"),
                 false
         );
         final ModuleXmlGenerator moduleXmlGenerator = new ModuleXmlGenerator(
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityGeneratorTest.java
index 3690e1180..ee518d05a 100644
--- a/tests/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityGeneratorTest.java
+++ b/tests/com/magento/idea/magento2plugin/actions/generation/generator/NewActionEntityGeneratorTest.java
@@ -39,7 +39,9 @@ public void testGenerateNewActionEntityFile() {
                 );
         final PsiFile newActionEntityActionFile =
                 newActionEntityControllerFileGenerator.generate("test");
-        final String filePath = this.getFixturePath(NewActionFile.getInstance().getFileName());
+        final String filePath = this.getFixturePath(
+                new NewActionFile(MODULE_NAME, ENTITY_NAME).getFileName()
+        );
         final PsiFile expectedFile = myFixture.configureByFile(filePath);
 
         assertGeneratedFileIsCorrect(
diff --git a/tests/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityCommandGeneratorTest.java b/tests/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityCommandGeneratorTest.java
index aa061c3c8..2a677b6c8 100644
--- a/tests/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityCommandGeneratorTest.java
+++ b/tests/com/magento/idea/magento2plugin/actions/generation/generator/SaveEntityCommandGeneratorTest.java
@@ -38,7 +38,7 @@ public void testGenerateSaveEntityCommandFile() {
                         false
                 );
         final String filePath = this.getFixturePath(
-                new SaveEntityCommandFile(ENTITY_NAME).getFileName()
+                new SaveEntityCommandFile(MODULE_NAME, ENTITY_NAME).getFileName()
         );
 
         assertGeneratedFileIsCorrect(
diff --git a/tests/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspectionTest.java b/tests/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspectionTest.java
index 90e0266b9..089d8fcbb 100644
--- a/tests/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspectionTest.java
+++ b/tests/com/magento/idea/magento2plugin/inspections/xml/ModuleDeclarationInModuleXmlInspectionTest.java
@@ -13,6 +13,7 @@ public class ModuleDeclarationInModuleXmlInspectionTest
     private static final String MESSAGE_ID =
             "inspection.moduleDeclaration.warning.wrongModuleName";
     private static final String WRONG_MODULE_NAME = "Wrong_ModuleName";
+    private static final String SETUP_VERSION_ATTRIBUTE_VALUE = "1.0.0";
 
     @Override
     public void setUp() throws Exception {
@@ -46,6 +47,27 @@ public void testWrongDeclarationInEditableModule() {
         assertHasHighlighting(errorMessage);
     }
 
+    /**
+     * Inspection do not highlight wrong module name warning for setup version attribute.
+     */
+    public void testSetupVersionNotErrorMessageInEditableModule() {
+        final Settings settings = Settings.getInstance(myFixture.getProject());
+        settings.magentoPath =
+                "/src/xml/ModuleDeclarationInModuleXmlInspection/"
+                        + "setupVersionNotErrorMessageInEditableModule";
+        myFixture.configureByFile(
+                getFixturePath("app/code/Test/TestModule/etc/" + ModuleXml.FILE_NAME)
+        );
+
+        final String errorMessage =  inspectionBundle.message(
+                MESSAGE_ID,
+                SETUP_VERSION_ATTRIBUTE_VALUE,
+                "Test_TestModule"
+        );
+
+        assertHasNoHighlighting(errorMessage);
+    }
+
     /**
      * Inspection skips sub tags.
      */
diff --git a/tests/com/magento/idea/magento2plugin/reference/BaseReferenceTestCase.java b/tests/com/magento/idea/magento2plugin/reference/BaseReferenceTestCase.java
index b48c8b720..560e685bb 100644
--- a/tests/com/magento/idea/magento2plugin/reference/BaseReferenceTestCase.java
+++ b/tests/com/magento/idea/magento2plugin/reference/BaseReferenceTestCase.java
@@ -39,13 +39,29 @@ protected void setUp() throws Exception {
     protected void assertHasReferenceToXmlAttributeValue(final String reference) {
         final PsiElement element = getElementFromCaret();
         for (final PsiReference psiReference: element.getReferences()) {
-            final PsiElement resolved = psiReference.resolve();
-            if (!(resolved instanceof XmlAttributeValue)) {
-                continue;
-            }
+            if (psiReference instanceof PolyVariantReferenceBase) {
+                final ResolveResult[] resolveResults
+                        = ((PolyVariantReferenceBase) psiReference).multiResolve(true);
 
-            if (((XmlAttributeValue) resolved).getValue().equals(reference)) {
-                return;
+                for (final ResolveResult resolveResult : resolveResults) {
+                    final PsiElement resolved = resolveResult.getElement();
+                    if (!(resolved instanceof XmlAttributeValue)) {
+                        continue;
+                    }
+
+                    if (((XmlAttributeValue) resolved).getValue().equals(reference)) {
+                        return;
+                    }
+                }
+            } else {
+                final PsiElement resolved = psiReference.resolve();
+                if (!(resolved instanceof XmlAttributeValue)) {
+                    continue;
+                }
+
+                if (((XmlAttributeValue) resolved).getValue().equals(reference)) {
+                    return;
+                }
             }
         }
         final String referenceNotFound =
diff --git a/tests/com/magento/idea/magento2plugin/reference/xml/ObserverReferenceRegistrarTest.java b/tests/com/magento/idea/magento2plugin/reference/xml/ObserverReferenceRegistrarTest.java
index 696dbc303..155852a18 100644
--- a/tests/com/magento/idea/magento2plugin/reference/xml/ObserverReferenceRegistrarTest.java
+++ b/tests/com/magento/idea/magento2plugin/reference/xml/ObserverReferenceRegistrarTest.java
@@ -18,6 +18,24 @@ public void testObserverInstanceMustHaveReference() {
         assertHasReferencePhpClass("Magento\\Catalog\\Observer\\TestObserver");
     }
 
+    /**
+     * Tests for observer instance with snake case reference in events.xml.
+     */
+    public void testObserverInstanceDirectorySnakeCaseMustHaveReference() {
+        myFixture.configureByFile(this.getFixturePath(ModuleEventsXml.FILE_NAME));
+
+        assertHasReferencePhpClass("Magento\\Catalog\\test_event\\TestObserver");
+    }
+
+    /**
+     * Tests for observer name reference in events.xml.
+     */
+    public void testObserverNameMustHaveReference() {
+        myFixture.configureByFile(this.getFixturePath(ModuleEventsXml.FILE_NAME));
+
+        assertHasReferenceToXmlAttributeValue("test_observer");
+    }
+
     /**
      * Tests for event name reference in events.xml.
      */

Predefined variables explanation:
${ID}		Email template ID.
${LABEL}		Email Template Label.
${FILE_NAME}		Email template file name.
${TYPE}		Email template type. (HTML or TEXT)
${MODULE}		Module's name.
${AREA}		Email template area. (Adminhtml or Frontend)
Predefined variables explanation:
${SUBJECT}		Email subject.
${HTML_TYPE}		Defines if it's HTML type template.
${TYPE}		Email template type. (HTML or TEXT)