diff --git a/.idea/modules.xml b/.idea/modules.xml
index 285e4797..c9f026b2 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,9 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Ballerina-Intellij-plugin.iml" filepath="$PROJECT_DIR$/Ballerina-Intellij-plugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/plugin-intellij.iml" filepath="$PROJECT_DIR$/.idea/modules/plugin-intellij.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/plugin-intellij_main.iml" filepath="$PROJECT_DIR$/.idea/modules/plugin-intellij_main.iml" group="plugin-intellij" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/plugin-intellij_test.iml" filepath="$PROJECT_DIR$/.idea/modules/plugin-intellij_test.iml" group="plugin-intellij" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..58fcf3b7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/adaptor" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Ballerina-Intellij-plugin.iml b/Ballerina-Intellij-plugin.iml
index 42a76a6a..1eecd29a 100644
--- a/Ballerina-Intellij-plugin.iml
+++ b/Ballerina-Intellij-plugin.iml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
-  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
+  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/main/resources/META-INF/plugin.xml" />
   <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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/adaptor/src" isTestSource="false" />
     </content>