diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java b/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java
index fb480c9de79..7d05c86985c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java
@@ -31,7 +31,7 @@ public class JetFileType extends LanguageFileType {
         @NotNull
         @Override
         protected Icon compute() {
-            return IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_file.png");
+            return IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin_file.png");
         }
     };
 
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIcons.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIcons.java
index b04ee650346..b4b153f2966 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIcons.java
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIcons.java
@@ -22,24 +22,24 @@ import com.intellij.util.PlatformIcons;
 import javax.swing.*;
 
 public interface JetIcons {
-    Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin.png");
-    Icon KOTLIN_LOGO_24 = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin24.png");
+    Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin.png");
+    Icon KOTLIN_LOGO_24 = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin24.png");
 
-    Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin13.png");
+    Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin13.png");
 
-    Icon CLASS = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/classKotlin.png");
-    Icon ENUM = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/enumKotlin.png");
-    Icon FILE = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_file.png");
-    Icon OBJECT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/objectKotlin.png");
-    Icon TRAIT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/traitKotlin.png");
-    Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/function.png");
+    Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/classKotlin.png");
+    Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/enumKotlin.png");
+    Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin_file.png");
+    Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/objectKotlin.png");
+    Icon TRAIT = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/traitKotlin.png");
+    Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/function.png");
     Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON;
-    Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/lambda.png");
+    Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/lambda.png");
     Icon VAR = PlatformIcons.VARIABLE_ICON;
-    Icon VAL = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/value.png");
+    Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/value.png");
     Icon PARAMETER = PlatformIcons.PARAMETER_ICON;
-    Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/field_value.png");
-    Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/field_variable.png");
+    Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/field_value.png");
+    Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/field_variable.png");
 
-    Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png");
+    Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin_launch_configuration.png");
 }
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/classKotlin.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/classKotlin.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/classKotlin.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin@2x.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/classKotlin@2x.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/classKotlin@2x.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/classKotlin@2x.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin@2x_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/classKotlin@2x_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/classKotlin@2x_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/classKotlin@2x_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/classKotlin_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/classKotlin_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/classKotlin_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/classKotlin_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/enumKotlin.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/enumKotlin.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin@2x.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/enumKotlin@2x.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin@2x.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/enumKotlin@2x.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin@2x_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/enumKotlin@2x_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin@2x_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/enumKotlin@2x_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/enumKotlin_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/enumKotlin_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/enumKotlin_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/field_value.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/field_value.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/field_value.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/field_value.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/field_variable.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/field_variable.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/field_variable.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/field_variable.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/function.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/function.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/function.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/function.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin13.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin13.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin13.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin13@2x.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin13@2x.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin13@2x.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin13@2x.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin24.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin24.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin24.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin24.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin24@2x.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin24@2x.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin24@2x.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin24@2x.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin@2x.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin@2x.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin@2x.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin@2x.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_file.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_file.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file@2x.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_file@2x.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file@2x.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_file@2x.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file@2x_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_file@2x_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file@2x_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_file@2x_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_file_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_file_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_launch_configuration.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_launch_configuration.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration@2x.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_launch_configuration@2x.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration@2x.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_launch_configuration@2x.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration@2x_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_launch_configuration@2x_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration@2x_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_launch_configuration@2x_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_launch_configuration_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/kotlin_launch_configuration_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/lambda.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/lambda.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/lambda.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/lambda.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/objectKotlin.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/objectKotlin.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin@2x.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/objectKotlin@2x.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin@2x.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/objectKotlin@2x.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin@2x_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/objectKotlin@2x_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin@2x_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/objectKotlin@2x_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/objectKotlin_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/objectKotlin_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/objectKotlin_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/traitKotlin.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/traitKotlin.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin@2x.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/traitKotlin@2x.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin@2x.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/traitKotlin@2x.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin@2x_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/traitKotlin@2x_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin@2x_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/traitKotlin@2x_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin_dark.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/traitKotlin_dark.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/traitKotlin_dark.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/traitKotlin_dark.png
diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/value.png b/idea/resources/org/jetbrains/kotlin/plugin/icons/value.png
similarity index 100%
rename from idea/resources/org/jetbrains/jet/plugin/icons/value.png
rename to idea/resources/org/jetbrains/kotlin/plugin/icons/value.png
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 95ac6b22471..727e684e556 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -81,7 +81,7 @@
       <add-to-group group-id="EditorGutterPopupMenu" anchor="last"/>
     </group>
 
-    <group id="KotlinToolsGroup" popup="true" text="Kotlin" icon="/org/jetbrains/jet/plugin/icons/kotlin13.png"
+    <group id="KotlinToolsGroup" popup="true" text="Kotlin" icon="/org/jetbrains/kotlin/plugin/icons/kotlin13.png"
            class="org.jetbrains.jet.plugin.actions.KotlinActionGroup">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </group>
@@ -443,7 +443,7 @@
     <toolWindow id="Kotlin Bytecode"
                 factoryClass="org.jetbrains.jet.plugin.internal.KotlinBytecodeToolWindow$Factory"
                 anchor="right"
-                icon="/org/jetbrains/jet/plugin/icons/kotlin13.png"
+                icon="/org/jetbrains/kotlin/plugin/icons/kotlin13.png"
                 canCloseContents="true"
         />