diff --git a/CHANGELOG.md b/CHANGELOG.md
index 001ba2bad..7205f6d22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0). 
 
+## 2.0.1
+
+### Fixed
+
+- Directories structure for the override in theme action
+- Constant disabling plugin on startup if Magento not in the root
+- New module generation for the default Magento version
+
 ## 2.0.0
 
 ### Added
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 c62e73fc3..6b62c665b 100644
--- a/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java
+++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java
@@ -13,6 +13,7 @@
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
 import com.maddyhome.idea.copyright.actions.UpdateCopyrightProcessor;
+import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.magento.packages.Areas;
@@ -126,16 +127,9 @@ private PsiDirectory getTargetDirectory(
             PsiDirectory directory, //NOPMD
             final List<String> pathComponents
     ) {
+        final DirectoryGenerator generator = DirectoryGenerator.getInstance();
         for (final String directoryName : pathComponents) {
-            if (directory.findSubdirectory(directoryName) != null) { //NOPMD
-                directory = directory.findSubdirectory(directoryName);
-            } else {
-                final PsiDirectory finalDirectory = directory;
-                ApplicationManager.getApplication().runWriteAction(() -> {
-                    finalDirectory.createSubdirectory(directoryName);
-                });
-                return finalDirectory;
-            }
+            directory = generator.findOrCreateSubdirectory(directory, directoryName);
         }
 
         return directory;