diff --git a/.idea/modules.xml b/.idea/modules.xml
index a05ee8883d7a..b3ca3e865f59 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -341,6 +341,10 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.uiDesigner/intellij.devkit.uiDesigner.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.workspaceModel/intellij.devkit.workspaceModel.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.workspaceModel/intellij.devkit.workspaceModel.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.workspaceModel/tests/intellij.devkit.workspaceModel.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/env-files-support/intellij.dotenv.iml" filepath="$PROJECT_DIR$/plugins/env-files-support/intellij.dotenv.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/env-files-support/java/intellij.dotenv.java.iml" filepath="$PROJECT_DIR$/plugins/env-files-support/java/intellij.dotenv.java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/env-files-support/kotlin/intellij.dotenv.kotlin.iml" filepath="$PROJECT_DIR$/plugins/env-files-support/kotlin/intellij.dotenv.kotlin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/env-files-support/python/intellij.dotenv.python.iml" filepath="$PROJECT_DIR$/plugins/env-files-support/python/intellij.dotenv.python.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/remote-driver/client/intellij.driver.client.iml" filepath="$PROJECT_DIR$/platform/remote-driver/client/intellij.driver.client.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/remote-driver/core/intellij.driver.impl.iml" filepath="$PROJECT_DIR$/platform/remote-driver/core/intellij.driver.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/remote-driver/model/intellij.driver.model.iml" filepath="$PROJECT_DIR$/platform/remote-driver/model/intellij.driver.model.iml" />
diff --git a/plugins/env-files-support/docker/intellij.dotenv.docker.iml b/plugins/env-files-support/docker/intellij.dotenv.docker.iml
new file mode 100644
index 000000000000..cbb1548681fd
--- /dev/null
+++ b/plugins/env-files-support/docker/intellij.dotenv.docker.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.yaml.editing" />
+    <orderEntry type="module" module-name="intellij.dotenv" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.clouds.docker.file" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/env-files-support/src/main/resources/intellij.dotenv.docker.xml b/plugins/env-files-support/docker/resources/intellij.dotenv.docker.xml
similarity index 92%
rename from plugins/env-files-support/src/main/resources/intellij.dotenv.docker.xml
rename to plugins/env-files-support/docker/resources/intellij.dotenv.docker.xml
index 85eded2d16dd..a2555b46e336 100644
--- a/plugins/env-files-support/src/main/resources/intellij.dotenv.docker.xml
+++ b/plugins/env-files-support/docker/resources/intellij.dotenv.docker.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="ru.adelf.idea.dotenv.docker">
   <dependencies>
     <module name="intellij.clouds.docker.file"/>
+    <plugin id="ru.adelf.idea.dotenv"/>
     <plugin id="Docker"/>
   </dependencies>
   <extensions defaultExtensionNs="ru.adelf.idea.dotenv">
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeKeyGotoHandler.java b/plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerComposeKeyGotoHandler.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeKeyGotoHandler.java
rename to plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerComposeKeyGotoHandler.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlPsiElementsVisitor.java b/plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerComposeYamlPsiElementsVisitor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlPsiElementsVisitor.java
rename to plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerComposeYamlPsiElementsVisitor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlVariablesProvider.java b/plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerComposeYamlVariablesProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlVariablesProvider.java
rename to plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerComposeYamlVariablesProvider.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileKeyGotoHandler.java b/plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerfileKeyGotoHandler.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileKeyGotoHandler.java
rename to plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerfileKeyGotoHandler.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfilePsiElementsVisitor.java b/plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerfilePsiElementsVisitor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfilePsiElementsVisitor.java
rename to plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerfilePsiElementsVisitor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileVariablesProvider.java b/plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerfileVariablesProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileVariablesProvider.java
rename to plugins/env-files-support/docker/src/ru/adelf/idea/dotenv/docker/DockerfileVariablesProvider.java
diff --git a/plugins/env-files-support/go/intellij.dotenv.go.iml b/plugins/env-files-support/go/intellij.dotenv.go.iml
new file mode 100644
index 000000000000..41f8cab661b1
--- /dev/null
+++ b/plugins/env-files-support/go/intellij.dotenv.go.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.go.impl" />
+    <orderEntry type="module" module-name="intellij.dotenv" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.go.frontback" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/env-files-support/src/main/resources/intellij.dotenv.go.xml b/plugins/env-files-support/go/resources/intellij.dotenv.go.xml
similarity index 100%
rename from plugins/env-files-support/src/main/resources/intellij.dotenv.go.xml
rename to plugins/env-files-support/go/resources/intellij.dotenv.go.xml
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvCompletionProvider.java b/plugins/env-files-support/go/src/ru/adelf/idea/dotenv/go/GoEnvCompletionProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvCompletionProvider.java
rename to plugins/env-files-support/go/src/ru/adelf/idea/dotenv/go/GoEnvCompletionProvider.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvironmentCallsVisitor.java b/plugins/env-files-support/go/src/ru/adelf/idea/dotenv/go/GoEnvironmentCallsVisitor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvironmentCallsVisitor.java
rename to plugins/env-files-support/go/src/ru/adelf/idea/dotenv/go/GoEnvironmentCallsVisitor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvironmentVariablesUsagesProvider.java b/plugins/env-files-support/go/src/ru/adelf/idea/dotenv/go/GoEnvironmentVariablesUsagesProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoEnvironmentVariablesUsagesProvider.java
rename to plugins/env-files-support/go/src/ru/adelf/idea/dotenv/go/GoEnvironmentVariablesUsagesProvider.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoPsiHelper.java b/plugins/env-files-support/go/src/ru/adelf/idea/dotenv/go/GoPsiHelper.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/go/GoPsiHelper.java
rename to plugins/env-files-support/go/src/ru/adelf/idea/dotenv/go/GoPsiHelper.java
diff --git a/plugins/env-files-support/intellij.dotenv.iml b/plugins/env-files-support/intellij.dotenv.iml
index e7f04f716830..ef5bc8901006 100644
--- a/plugins/env-files-support/intellij.dotenv.iml
+++ b/plugins/env-files-support/intellij.dotenv.iml
@@ -11,26 +11,11 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" />
-    <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
-    <orderEntry type="module" module-name="intellij.yaml.editing" />
-    <orderEntry type="module" module-name="intellij.xml.psi" />
-    <orderEntry type="module" module-name="intellij.xml.psi.impl" />
-    <orderEntry type="module" module-name="intellij.php" />
-    <orderEntry type="module" module-name="intellij.php.frontback" />
-    <orderEntry type="module" module-name="intellij.php.impl" />
-    <orderEntry type="module" module-name="intellij.python.psi" />
-    <orderEntry type="module" module-name="intellij.python.parser" />
-    <orderEntry type="module" module-name="intellij.clouds.docker.file" />
-    <orderEntry type="module" module-name="intellij.ruby.psi" />
-    <orderEntry type="module" module-name="intellij.java.psi" />
-    <orderEntry type="module" module-name="intellij.java.frontback.psi.impl" />
-    <orderEntry type="module" module-name="intellij.go.impl" />
-    <orderEntry type="module" module-name="intellij.go.frontback" />
-    <orderEntry type="library" scope="PROVIDED" name="kotlinc.kotlin-compiler-common" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.refactoring" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/env-files-support/java/intellij.dotenv.java.iml b/plugins/env-files-support/java/intellij.dotenv.java.iml
new file mode 100644
index 000000000000..66f834774fd7
--- /dev/null
+++ b/plugins/env-files-support/java/intellij.dotenv.java.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.dotenv" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.java.frontback.psi.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/env-files-support/src/main/resources/intellij.dotenv.java.xml b/plugins/env-files-support/java/resources/intellij.dotenv.java.xml
similarity index 100%
rename from plugins/env-files-support/src/main/resources/intellij.dotenv.java.xml
rename to plugins/env-files-support/java/resources/intellij.dotenv.java.xml
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaCompletionConfidence.java b/plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaCompletionConfidence.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaCompletionConfidence.java
rename to plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaCompletionConfidence.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaEnvCompletionContributor.java b/plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaEnvCompletionContributor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaEnvCompletionContributor.java
rename to plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaEnvCompletionContributor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaEnvironmentCallsVisitor.java b/plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaEnvironmentCallsVisitor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaEnvironmentCallsVisitor.java
rename to plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaEnvironmentCallsVisitor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaEnvironmentClasses.java b/plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaEnvironmentClasses.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaEnvironmentClasses.java
rename to plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaEnvironmentClasses.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaEnvironmentVariablesUsagesProvider.java b/plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaEnvironmentVariablesUsagesProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaEnvironmentVariablesUsagesProvider.java
rename to plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaEnvironmentVariablesUsagesProvider.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaPsiHelper.java b/plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaPsiHelper.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/java/JavaPsiHelper.java
rename to plugins/env-files-support/java/src/ru/adelf/idea/dotenv/java/JavaPsiHelper.java
diff --git a/plugins/env-files-support/kotlin/intellij.dotenv.kotlin.iml b/plugins/env-files-support/kotlin/intellij.dotenv.kotlin.iml
new file mode 100644
index 000000000000..c36cc01ed328
--- /dev/null
+++ b/plugins/env-files-support/kotlin/intellij.dotenv.kotlin.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.dotenv" />
+    <orderEntry type="module" module-name="intellij.dotenv.java" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="library" scope="PROVIDED" name="kotlinc.kotlin-compiler-common" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/env-files-support/src/main/resources/intellij.dotenv.kotlin.xml b/plugins/env-files-support/kotlin/resources/intellij.dotenv.kotlin.xml
similarity index 100%
rename from plugins/env-files-support/src/main/resources/intellij.dotenv.kotlin.xml
rename to plugins/env-files-support/kotlin/resources/intellij.dotenv.kotlin.xml
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/kotlin/KotlinCompletionConfidence.java b/plugins/env-files-support/kotlin/src/ru/adelf/idea/dotenv/kotlin/KotlinCompletionConfidence.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/kotlin/KotlinCompletionConfidence.java
rename to plugins/env-files-support/kotlin/src/ru/adelf/idea/dotenv/kotlin/KotlinCompletionConfidence.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/kotlin/KotlinEnvCompletionContributor.java b/plugins/env-files-support/kotlin/src/ru/adelf/idea/dotenv/kotlin/KotlinEnvCompletionContributor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/kotlin/KotlinEnvCompletionContributor.java
rename to plugins/env-files-support/kotlin/src/ru/adelf/idea/dotenv/kotlin/KotlinEnvCompletionContributor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/kotlin/KotlinEnvironmentCallsVisitor.java b/plugins/env-files-support/kotlin/src/ru/adelf/idea/dotenv/kotlin/KotlinEnvironmentCallsVisitor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/kotlin/KotlinEnvironmentCallsVisitor.java
rename to plugins/env-files-support/kotlin/src/ru/adelf/idea/dotenv/kotlin/KotlinEnvironmentCallsVisitor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/kotlin/KotlinEnvironmentVariablesUsagesProvider.java b/plugins/env-files-support/kotlin/src/ru/adelf/idea/dotenv/kotlin/KotlinEnvironmentVariablesUsagesProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/kotlin/KotlinEnvironmentVariablesUsagesProvider.java
rename to plugins/env-files-support/kotlin/src/ru/adelf/idea/dotenv/kotlin/KotlinEnvironmentVariablesUsagesProvider.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/kotlin/KotlinPsiHelper.java b/plugins/env-files-support/kotlin/src/ru/adelf/idea/dotenv/kotlin/KotlinPsiHelper.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/kotlin/KotlinPsiHelper.java
rename to plugins/env-files-support/kotlin/src/ru/adelf/idea/dotenv/kotlin/KotlinPsiHelper.java
diff --git a/plugins/env-files-support/php/intellij.dotenv.php.iml b/plugins/env-files-support/php/intellij.dotenv.php.iml
new file mode 100644
index 000000000000..2184118228a8
--- /dev/null
+++ b/plugins/env-files-support/php/intellij.dotenv.php.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.php.frontback.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.dotenv" />
+    <orderEntry type="module" module-name="intellij.php" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.xml.psi.impl" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/env-files-support/src/main/resources/intellij.dotenv.php.xml b/plugins/env-files-support/php/resources/intellij.dotenv.php.xml
similarity index 96%
rename from plugins/env-files-support/src/main/resources/intellij.dotenv.php.xml
rename to plugins/env-files-support/php/resources/intellij.dotenv.php.xml
index 304f79222d29..2227204d209e 100644
--- a/plugins/env-files-support/src/main/resources/intellij.dotenv.php.xml
+++ b/plugins/env-files-support/php/resources/intellij.dotenv.php.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="ru.adelf.idea.dotenv.php">
   <dependencies>
     <plugin id="com.jetbrains.php"/>
+    <plugin id="ru.adelf.idea.dotenv"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <completion.contributor language="PHP" implementationClass="ru.adelf.idea.dotenv.php.PhpEnvCompletionContributor"/>
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpEnvCompletionContributor.java b/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpEnvCompletionContributor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpEnvCompletionContributor.java
rename to plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpEnvCompletionContributor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpEnvironmentCallsVisitor.java b/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpEnvironmentCallsVisitor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpEnvironmentCallsVisitor.java
rename to plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpEnvironmentCallsVisitor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpEnvironmentVariablesUsagesProvider.java b/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpEnvironmentVariablesUsagesProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpEnvironmentVariablesUsagesProvider.java
rename to plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpEnvironmentVariablesUsagesProvider.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpFileTypeOverrider.java b/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpFileTypeOverrider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpFileTypeOverrider.java
rename to plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpFileTypeOverrider.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpPsiHelper.java b/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpPsiHelper.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpPsiHelper.java
rename to plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpPsiHelper.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpunitEnvCompletionContributor.java b/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpunitEnvCompletionContributor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpunitEnvCompletionContributor.java
rename to plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpunitEnvCompletionContributor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpunitEnvironmentVariablesUsagesProvider.java b/plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpunitEnvironmentVariablesUsagesProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/php/PhpunitEnvironmentVariablesUsagesProvider.java
rename to plugins/env-files-support/php/src/ru/adelf/idea/dotenv/php/PhpunitEnvironmentVariablesUsagesProvider.java
diff --git a/plugins/env-files-support/plugin-content.yaml b/plugins/env-files-support/plugin-content.yaml
index 7e8c881e6d6e..a66e19fd168a 100644
--- a/plugins/env-files-support/plugin-content.yaml
+++ b/plugins/env-files-support/plugin-content.yaml
@@ -1,3 +1,12 @@
 - name: lib/dotenv.jar
   modules:
-  - name: intellij.dotenv
\ No newline at end of file
+  - name: intellij.dotenv
+  - name: intellij.dotenv.php
+  - name: intellij.dotenv.go
+  - name: intellij.dotenv.ruby
+  - name: intellij.dotenv.docker
+  - name: intellij.dotenv.ultimate
+  contentModules:
+  - name: intellij.dotenv.kotlin
+  - name: intellij.dotenv.python
+  - name: intellij.dotenv.java
\ No newline at end of file
diff --git a/plugins/env-files-support/python/intellij.dotenv.python.iml b/plugins/env-files-support/python/intellij.dotenv.python.iml
new file mode 100644
index 000000000000..102b4dfaba46
--- /dev/null
+++ b/plugins/env-files-support/python/intellij.dotenv.python.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.python.psi" />
+    <orderEntry type="module" module-name="intellij.dotenv" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/env-files-support/src/main/resources/intellij.dotenv.python.xml b/plugins/env-files-support/python/resources/intellij.dotenv.python.xml
similarity index 100%
rename from plugins/env-files-support/src/main/resources/intellij.dotenv.python.xml
rename to plugins/env-files-support/python/resources/intellij.dotenv.python.xml
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/python/PythonEnvCompletionProvider.java b/plugins/env-files-support/python/src/ru/adelf/idea/dotenv/python/PythonEnvCompletionProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/python/PythonEnvCompletionProvider.java
rename to plugins/env-files-support/python/src/ru/adelf/idea/dotenv/python/PythonEnvCompletionProvider.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/python/PythonEnvironmentCallsVisitor.java b/plugins/env-files-support/python/src/ru/adelf/idea/dotenv/python/PythonEnvironmentCallsVisitor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/python/PythonEnvironmentCallsVisitor.java
rename to plugins/env-files-support/python/src/ru/adelf/idea/dotenv/python/PythonEnvironmentCallsVisitor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/python/PythonEnvironmentVariablesUsagesProvider.java b/plugins/env-files-support/python/src/ru/adelf/idea/dotenv/python/PythonEnvironmentVariablesUsagesProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/python/PythonEnvironmentVariablesUsagesProvider.java
rename to plugins/env-files-support/python/src/ru/adelf/idea/dotenv/python/PythonEnvironmentVariablesUsagesProvider.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/python/PythonPsiHelper.java b/plugins/env-files-support/python/src/ru/adelf/idea/dotenv/python/PythonPsiHelper.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/python/PythonPsiHelper.java
rename to plugins/env-files-support/python/src/ru/adelf/idea/dotenv/python/PythonPsiHelper.java
diff --git a/plugins/env-files-support/ruby/intellij.dotenv.ruby.iml b/plugins/env-files-support/ruby/intellij.dotenv.ruby.iml
new file mode 100644
index 000000000000..c009961363d8
--- /dev/null
+++ b/plugins/env-files-support/ruby/intellij.dotenv.ruby.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.dotenv" />
+    <orderEntry type="module" module-name="intellij.ruby.psi" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.ruby.core" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/env-files-support/src/main/resources/intellij.dotenv.ruby.xml b/plugins/env-files-support/ruby/resources/intellij.dotenv.ruby.xml
similarity index 93%
rename from plugins/env-files-support/src/main/resources/intellij.dotenv.ruby.xml
rename to plugins/env-files-support/ruby/resources/intellij.dotenv.ruby.xml
index 934d88b58df4..6e5d1a7924b5 100644
--- a/plugins/env-files-support/src/main/resources/intellij.dotenv.ruby.xml
+++ b/plugins/env-files-support/ruby/resources/intellij.dotenv.ruby.xml
@@ -1,6 +1,7 @@
 <idea-plugin package="ru.adelf.idea.dotenv.ruby">
   <dependencies>
     <plugin id="com.intellij.modules.ruby"/>
+    <plugin id="ru.adelf.idea.dotenv"/>
   </dependencies>
   <extensions defaultExtensionNs="com.intellij">
     <completion.contributor language="ruby" implementationClass="ru.adelf.idea.dotenv.ruby.RubyEnvCompletionProvider"/>
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/ruby/RubyEnvCompletionProvider.java b/plugins/env-files-support/ruby/src/ru/adelf/idea/dotenv/ruby/RubyEnvCompletionProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/ruby/RubyEnvCompletionProvider.java
rename to plugins/env-files-support/ruby/src/ru/adelf/idea/dotenv/ruby/RubyEnvCompletionProvider.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/ruby/RubyEnvironmentCallsVisitor.java b/plugins/env-files-support/ruby/src/ru/adelf/idea/dotenv/ruby/RubyEnvironmentCallsVisitor.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/ruby/RubyEnvironmentCallsVisitor.java
rename to plugins/env-files-support/ruby/src/ru/adelf/idea/dotenv/ruby/RubyEnvironmentCallsVisitor.java
diff --git a/plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/ruby/RubyEnvironmentVariablesUsagesProvider.java b/plugins/env-files-support/ruby/src/ru/adelf/idea/dotenv/ruby/RubyEnvironmentVariablesUsagesProvider.java
similarity index 100%
rename from plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/ruby/RubyEnvironmentVariablesUsagesProvider.java
rename to plugins/env-files-support/ruby/src/ru/adelf/idea/dotenv/ruby/RubyEnvironmentVariablesUsagesProvider.java
diff --git a/plugins/env-files-support/src/main/resources/META-INF/plugin.xml b/plugins/env-files-support/src/main/resources/META-INF/plugin.xml
index 1b7304f8962b..8b1943b5ea02 100644
--- a/plugins/env-files-support/src/main/resources/META-INF/plugin.xml
+++ b/plugins/env-files-support/src/main/resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin>
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" package="ru.adelf.idea.dotenv">
     <id>ru.adelf.idea.dotenv</id>
     <name>.env files support</name>
     <vendor>JetBrains</vendor>
@@ -34,20 +34,19 @@
     </extensionPoints>
 
     <dependencies>
-      <plugin id="com.intellij.modules.platform" />
       <plugin id="org.jetbrains.plugins.yaml"/>
     </dependencies>
 
     <content>
-      <module name="intellij.dotenv/php"/>
-      <module name="intellij.dotenv/go"/>
-      <module name="intellij.dotenv/kotlin"/>
-      <module name="intellij.dotenv/python"/>
-      <module name="intellij.dotenv/ruby"/>
-      <module name="intellij.dotenv/java"/>
-      <module name="intellij.dotenv/docker"/>
+      <module name="intellij.dotenv.kotlin"/>
+      <module name="intellij.dotenv.python"/>
+      <module name="intellij.dotenv.java"/>
     </content>
 
+    <xi:include href="/META-INF/dotenv-ultimate.xml">
+        <xi:fallback/>
+    </xi:include>
+
     <extensions defaultExtensionNs="com.intellij">
         <applicationService serviceImplementation="ru.adelf.idea.dotenv.DotEnvSettings"/>
 
diff --git a/plugins/env-files-support/tests/intellij.dotenv.tests.iml b/plugins/env-files-support/tests/intellij.dotenv.tests.iml
index b5ba18269075..6a0f1992f198 100644
--- a/plugins/env-files-support/tests/intellij.dotenv.tests.iml
+++ b/plugins/env-files-support/tests/intellij.dotenv.tests.iml
@@ -9,6 +9,13 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.dotenv" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.dotenv.php" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.dotenv.go" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.dotenv.kotlin" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.dotenv.java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.dotenv.python" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.dotenv.ruby" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.dotenv.docker" scope="TEST" />
     <orderEntry type="module" module-name="intellij.go.plugin" scope="TEST" />
     <orderEntry type="module" module-name="intellij.python.community.plugin.modules" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java" scope="TEST" />