diff --git a/plugins/devkit/devkit.iml b/plugins/devkit/devkit.iml
index 79e4f49e20b0..f6c4b3042f85 100644
--- a/plugins/devkit/devkit.iml
+++ b/plugins/devkit/devkit.iml
@@ -3,9 +3,10 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="org.jetbrains.idea.devkit" />
       <sourceFolder url="file://$MODULE_DIR$/testSources" isTestSource="true" packagePrefix="org.jetbrains.idea.devkit" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/plugins/devkit/resources/icons/DevkitIcons.java b/plugins/devkit/gen/icons/DevkitIcons.java
similarity index 86%
rename from plugins/devkit/resources/icons/DevkitIcons.java
rename to plugins/devkit/gen/icons/DevkitIcons.java
index 28437acb2b3f..224887594efb 100644
--- a/plugins/devkit/resources/icons/DevkitIcons.java
+++ b/plugins/devkit/gen/icons/DevkitIcons.java
@@ -28,6 +28,6 @@ public class DevkitIcons {
     return IconLoader.getIcon(path, DevkitIcons.class);
   }
 
-  public static final Icon Add_sdk = load("/add_sdk.png"); // 16x16
-  public static final Icon Sdk_closed = load("/sdk_closed.png"); // 16x16
+  public static final Icon Add_sdk = load("/icons/add_sdk.png"); // 16x16
+  public static final Icon Sdk_closed = load("/icons/sdk_closed.png"); // 16x16
 }
diff --git a/plugins/devkit/src/DevKitBundle.properties b/plugins/devkit/resources/DevKitBundle.properties
similarity index 100%
rename from plugins/devkit/src/DevKitBundle.properties
rename to plugins/devkit/resources/DevKitBundle.properties
diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index fadad369c4b0..88fadf52dc42 100644
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -12,7 +12,7 @@
 
   <depends>com.intellij.properties</depends>
 
-  <resource-bundle>org.jetbrains.idea.devkit.DevKitBundle</resource-bundle>
+  <resource-bundle>DevKitBundle</resource-bundle>
 
   <extensions defaultExtensionNs="com.intellij">
     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
@@ -56,52 +56,52 @@
                                 implementationClass="org.jetbrains.idea.devkit.references.extensions.ExtensionPointDocumentationProvider"/>
 
     <localInspection language="XML" shortName="PluginXmlValidity" displayName="Plugin.xml Validity"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name" enabledByDefault="true" level="ERROR"
                      implementationClass="org.jetbrains.idea.devkit.inspections.PluginXmlDomInspection"/>
-    <localInspection language="JAVA" shortName="ComponentNotRegistered" bundle="org.jetbrains.idea.devkit.DevKitBundle"
+    <localInspection language="JAVA" shortName="ComponentNotRegistered" bundle="DevKitBundle"
                      key="inspections.component.not.registered.name" groupKey="inspections.group.name" enabledByDefault="true"
                      level="WARNING" implementationClass="org.jetbrains.idea.devkit.inspections.ComponentNotRegisteredInspection"/>
     <localInspection language="JAVA" shortName="InspectionDescriptionNotFoundInspection" displayName="Inspection Description Checker"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name" enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.InspectionDescriptionNotFoundInspection"/>
     <localInspection language="JAVA" shortName="InspectionUsingGrayColors" displayName="Using new Color(a,a,a)"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name" enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.UseGrayInspection"/>
     <localInspection language="JAVA" shortName="IntentionDescriptionNotFoundInspection" displayName="Intention Description Checker"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name" enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.IntentionDescriptionNotFoundInspection"/>
     <localInspection language="JAVA"
                      key="inspections.component.postfix.template.not.found.description.name"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      enabledByDefault="true"
                      level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.PostfixTemplateDescriptionNotFoundInspection"/>
     <localInspection shortName="ComponentRegistrationProblems"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle" key="inspections.registration.problems.name"
+                     bundle="DevKitBundle" key="inspections.registration.problems.name"
                      groupKey="inspections.group.name"
                      enabledByDefault="true" level="ERROR"
                      implementationClass="org.jetbrains.idea.devkit.inspections.RegistrationProblemsInspection"/>
     <localInspection language="JAVA" shortName="DialogTitleCapitalization"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      displayName="Incorrect dialog title capitalization"
                      enabledByDefault="true"
                      level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.TitleCapitalizationInspection"/>
     <localInspection language="XML" shortName="InspectionMappingConsistency"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      displayName="&lt;inspection&gt; tag consistency"
                      enabledByDefault="true"
                      level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.InspectionMappingConsistencyInspection"/>
     <localInspection language="XML" shortName="ExtensionPointBeanClass"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      displayName="&lt;extensionPoint&gt; beanClass specification"
                      enabledByDefault="true"
@@ -109,42 +109,42 @@
                      implementationClass="org.jetbrains.idea.devkit.inspections.ExtensionPointBeanClassInspection"/>
 
     <localInspection language="JAVA" shortName="UndesirableClassUsage" displayName="Undesirable class usage"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.internal.UndesirableClassUsageInspection"/>
     <localInspection language="JAVA" shortName="FileEqualsUsage" displayName="File.equals() usage"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.internal.FileEqualsUsageInspection"/>
     <localInspection language="JAVA" shortName="GtkPreferredJComboBoxRenderer" displayName="Preferred JComboBox renderer"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.internal.GtkPreferredJComboBoxRendererInspection"/>
     <localInspection language="JAVA" shortName="UnsafeVfsRecursion" displayName="Unsafe VFS recursion"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.internal.UnsafeVfsRecursionInspection"/>
     <localInspection language="JAVA" shortName="UseJBColor" displayName="Use Darcula aware JBColor"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.internal.UseJBColorInspection"/>
     <localInspection language="JAVA" shortName="UseCouple" displayName="Use Couple instead of Pair"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      enabledByDefault="false" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.internal.UseCoupleInspection"/>
     <localInspection language="JAVA" shortName="DontUsePairConstructor" displayName="Don't use constructor of Pair class"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.internal.DontUseNewPairInspection"/>
     <localInspection language="JAVA" shortName="UseVirtualFileEquals" displayName="Use VirtualFile.equals"
-                     bundle="org.jetbrains.idea.devkit.DevKitBundle"
+                     bundle="DevKitBundle"
                      groupKey="inspections.group.name"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="org.jetbrains.idea.devkit.inspections.internal.UseVirtualFileEqualsInspection"/>
@@ -173,7 +173,7 @@
       <implementation-class>org.jetbrains.idea.devkit.testAssistant.TestDataHighlightingPassFactory</implementation-class>
     </component>
   </project-components>
-  
+
   <module-components>
     <component>
       <implementation-class>org.jetbrains.idea.devkit.build.PluginBuildConfiguration</implementation-class>
@@ -226,7 +226,7 @@
               id="GenerateDomModel"/>
 
       <add-to-group group-id="Internal" anchor="last"/>
-      
+
     </group>
     <action id="TestData.Navigate"
             class="org.jetbrains.idea.devkit.testAssistant.NavigateToTestDataAction"
diff --git a/plugins/devkit/resources/add_sdk.png b/plugins/devkit/resources/icons/add_sdk.png
similarity index 100%
rename from plugins/devkit/resources/add_sdk.png
rename to plugins/devkit/resources/icons/add_sdk.png
diff --git a/plugins/devkit/resources/add_sdk@2x.png b/plugins/devkit/resources/icons/add_sdk@2x.png
similarity index 100%
rename from plugins/devkit/resources/add_sdk@2x.png
rename to plugins/devkit/resources/icons/add_sdk@2x.png
diff --git a/plugins/devkit/resources/sdk_closed.png b/plugins/devkit/resources/icons/sdk_closed.png
similarity index 100%
rename from plugins/devkit/resources/sdk_closed.png
rename to plugins/devkit/resources/icons/sdk_closed.png
diff --git a/plugins/devkit/resources/sdk_closed@2x.png b/plugins/devkit/resources/icons/sdk_closed@2x.png
similarity index 100%
rename from plugins/devkit/resources/sdk_closed@2x.png
rename to plugins/devkit/resources/icons/sdk_closed@2x.png
diff --git a/plugins/devkit/src/DevKitBundle.java b/plugins/devkit/src/DevKitBundle.java
index d5460ad123f9..013fd2f43e6b 100644
--- a/plugins/devkit/src/DevKitBundle.java
+++ b/plugins/devkit/src/DevKitBundle.java
@@ -26,7 +26,7 @@ public class DevKitBundle extends AbstractBundle {
     return ourInstance.getMessage(key, params);
   }
 
-  @NonNls private static final String BUNDLE = "org.jetbrains.idea.devkit.DevKitBundle";
+  @NonNls private static final String BUNDLE = "DevKitBundle";
   private static final DevKitBundle ourInstance = new DevKitBundle();
 
   private DevKitBundle() {