diff --git a/.idea/modules.xml b/.idea/modules.xml
index afc6d2a0623c..323302d1f724 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -35,7 +35,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/groovy/rt/groovy-rt.iml" filepath="$PROJECT_DIR$/plugins/groovy/rt/groovy-rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/icons/icons.iml" filepath="$PROJECT_DIR$/platform/icons/icons.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/java/idea-ui/idea-ui.iml" filepath="$PROJECT_DIR$/java/idea-ui/idea-ui.iml" group="java" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/images/images.iml" filepath="$PROJECT_DIR$/plugins/images/images.iml" />
+      <module fileurl="file://$PROJECT_DIR$/images/images.iml" filepath="$PROJECT_DIR$/images/images.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" filepath="$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/java/java-impl/java-impl.iml" filepath="$PROJECT_DIR$/java/java-impl/java-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-runtime/java-runtime.iml" filepath="$PROJECT_DIR$/java/java-runtime/java-runtime.iml" group="java" />
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 38ad668574e8..2ef163ed660d 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -36,6 +36,7 @@ private List platformImplementationModules() {
           "testFramework",
           "xml",
           "lvcs-impl",
+          "images",
   ]
 }
 
@@ -146,7 +147,7 @@ def layoutFull(String home, String targetDirectory) {
     }
 
     dir("plugins") {
-      def simplePlugins = ["commander", "copyright", "properties", "java-i18n", "images", "devkit", "eclipse"]
+      def simplePlugins = ["commander", "copyright", "properties", "java-i18n", "devkit", "eclipse"]
 
       simplePlugins.each {
         layoutPlugin it
diff --git a/plugins/images/images.iml b/images/images.iml
similarity index 100%
rename from plugins/images/images.iml
rename to images/images.iml
diff --git a/plugins/images/src/org/intellij/images/ImagesBundle.java b/images/src/org/intellij/images/ImagesBundle.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/ImagesBundle.java
rename to images/src/org/intellij/images/ImagesBundle.java
diff --git a/plugins/images/src/org/intellij/images/ImagesBundle.properties b/images/src/org/intellij/images/ImagesBundle.properties
similarity index 100%
rename from plugins/images/src/org/intellij/images/ImagesBundle.properties
rename to images/src/org/intellij/images/ImagesBundle.properties
diff --git a/plugins/images/src/org/intellij/images/actions/EditExternalyAction.java b/images/src/org/intellij/images/actions/EditExternalyAction.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/actions/EditExternalyAction.java
rename to images/src/org/intellij/images/actions/EditExternalyAction.java
diff --git a/plugins/images/src/org/intellij/images/actions/ShowThumbnailsAction.java b/images/src/org/intellij/images/actions/ShowThumbnailsAction.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/actions/ShowThumbnailsAction.java
rename to images/src/org/intellij/images/actions/ShowThumbnailsAction.java
diff --git a/plugins/images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java b/images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java
similarity index 50%
rename from plugins/images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java
rename to images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java
index b9411078e86b..0fd76172942c 100644
--- a/plugins/images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java
+++ b/images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java
@@ -26,21 +26,22 @@ import org.intellij.images.ui.ImageComponentDecorator;
  * @see org.intellij.images.ui.ImageComponentDecorator#setTransparencyChessboardVisible
  */
 public final class ToggleTransparencyChessboardAction extends ToggleAction {
-    public boolean isSelected(AnActionEvent e) {
-        ImageComponentDecorator decorator = (ImageComponentDecorator) e.getDataContext().getData(ImageComponentDecorator.class.getName());
-        return decorator != null && decorator.isEnabledForActionPlace(e.getPlace()) && decorator.isTransparencyChessboardVisible();
-    }
+  public boolean isSelected(AnActionEvent e) {
+    ImageComponentDecorator decorator = (ImageComponentDecorator)e.getDataContext().getData(ImageComponentDecorator.class.getName());
+    return decorator != null && decorator.isEnabledForActionPlace(e.getPlace()) && decorator.isTransparencyChessboardVisible();
+  }
 
-    public void setSelected(AnActionEvent e, boolean state) {
-        ImageComponentDecorator decorator = (ImageComponentDecorator) e.getDataContext().getData(ImageComponentDecorator.class.getName());
-        if (decorator != null && decorator.isEnabledForActionPlace(e.getPlace())) {
-            decorator.setTransparencyChessboardVisible(state);
-        }
+  public void setSelected(AnActionEvent e, boolean state) {
+    ImageComponentDecorator decorator = (ImageComponentDecorator)e.getDataContext().getData(ImageComponentDecorator.class.getName());
+    if (decorator != null && decorator.isEnabledForActionPlace(e.getPlace())) {
+      decorator.setTransparencyChessboardVisible(state);
     }
+  }
 
-    public void update(final AnActionEvent e) {
-        super.update(e);
-        ImageComponentDecorator decorator = (ImageComponentDecorator) e.getDataContext().getData(ImageComponentDecorator.class.getName());
-        e.getPresentation().setEnabled(decorator != null && decorator.isEnabledForActionPlace(e.getPlace()));
-    }
+  public void update(final AnActionEvent e) {
+    super.update(e);
+    ImageComponentDecorator decorator = (ImageComponentDecorator)e.getDataContext().getData(ImageComponentDecorator.class.getName());
+    e.getPresentation().setEnabled(decorator != null && decorator.isEnabledForActionPlace(e.getPlace()));
+    e.getPresentation().setText(isSelected(e) ? "Hide Chessboard" : "Show Chessboard");
+  }
 }
diff --git a/plugins/images/src/org/intellij/images/completion/ImageLookupInfoProvider.java b/images/src/org/intellij/images/completion/ImageLookupInfoProvider.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/completion/ImageLookupInfoProvider.java
rename to images/src/org/intellij/images/completion/ImageLookupInfoProvider.java
diff --git a/plugins/images/src/org/intellij/images/editor/ImageDocument.java b/images/src/org/intellij/images/editor/ImageDocument.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/ImageDocument.java
rename to images/src/org/intellij/images/editor/ImageDocument.java
diff --git a/plugins/images/src/org/intellij/images/editor/ImageEditor.java b/images/src/org/intellij/images/editor/ImageEditor.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/ImageEditor.java
rename to images/src/org/intellij/images/editor/ImageEditor.java
diff --git a/plugins/images/src/org/intellij/images/editor/ImageFileEditor.java b/images/src/org/intellij/images/editor/ImageFileEditor.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/ImageFileEditor.java
rename to images/src/org/intellij/images/editor/ImageFileEditor.java
diff --git a/plugins/images/src/org/intellij/images/editor/ImageZoomModel.java b/images/src/org/intellij/images/editor/ImageZoomModel.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/ImageZoomModel.java
rename to images/src/org/intellij/images/editor/ImageZoomModel.java
diff --git a/plugins/images/src/org/intellij/images/editor/actionSystem/ImageEditorActionUtil.java b/images/src/org/intellij/images/editor/actionSystem/ImageEditorActionUtil.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/actionSystem/ImageEditorActionUtil.java
rename to images/src/org/intellij/images/editor/actionSystem/ImageEditorActionUtil.java
diff --git a/plugins/images/src/org/intellij/images/editor/actionSystem/ImageEditorActions.java b/images/src/org/intellij/images/editor/actionSystem/ImageEditorActions.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/actionSystem/ImageEditorActions.java
rename to images/src/org/intellij/images/editor/actionSystem/ImageEditorActions.java
diff --git a/plugins/images/src/org/intellij/images/editor/actions/ActualSizeAction.java b/images/src/org/intellij/images/editor/actions/ActualSizeAction.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/actions/ActualSizeAction.java
rename to images/src/org/intellij/images/editor/actions/ActualSizeAction.java
diff --git a/plugins/images/src/org/intellij/images/editor/actions/ToggleGridAction.java b/images/src/org/intellij/images/editor/actions/ToggleGridAction.java
similarity index 66%
rename from plugins/images/src/org/intellij/images/editor/actions/ToggleGridAction.java
rename to images/src/org/intellij/images/editor/actions/ToggleGridAction.java
index 07e53f81e9c7..53ca4b2f7354 100644
--- a/plugins/images/src/org/intellij/images/editor/actions/ToggleGridAction.java
+++ b/images/src/org/intellij/images/editor/actions/ToggleGridAction.java
@@ -27,20 +27,21 @@ import org.intellij.images.editor.actionSystem.ImageEditorActionUtil;
  * @see ImageEditor#setGridVisible
  */
 public final class ToggleGridAction extends ToggleAction {
-    public boolean isSelected(AnActionEvent e) {
-        ImageEditor editor = ImageEditorActionUtil.getValidEditor(e);
-        return editor != null && editor.isGridVisible();
-    }
+  public boolean isSelected(AnActionEvent e) {
+    ImageEditor editor = ImageEditorActionUtil.getValidEditor(e);
+    return editor != null && editor.isGridVisible();
+  }
 
-    public void setSelected(AnActionEvent e, boolean state) {
-        ImageEditor editor = ImageEditorActionUtil.getValidEditor(e);
-        if (editor != null) {
-            editor.setGridVisible(state);
-        }
+  public void setSelected(AnActionEvent e, boolean state) {
+    ImageEditor editor = ImageEditorActionUtil.getValidEditor(e);
+    if (editor != null) {
+      editor.setGridVisible(state);
     }
+  }
 
-    public void update(final AnActionEvent e) {
-        super.update(e);
-        ImageEditorActionUtil.setEnabled(e);
-    }
+  public void update(final AnActionEvent e) {
+    super.update(e);
+    ImageEditorActionUtil.setEnabled(e);
+    e.getPresentation().setText(isSelected(e) ? "Hide Grid" : "Show Grid");
+  }
 }
diff --git a/plugins/images/src/org/intellij/images/editor/actions/ZoomInAction.java b/images/src/org/intellij/images/editor/actions/ZoomInAction.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/actions/ZoomInAction.java
rename to images/src/org/intellij/images/editor/actions/ZoomInAction.java
diff --git a/plugins/images/src/org/intellij/images/editor/actions/ZoomOutAction.java b/images/src/org/intellij/images/editor/actions/ZoomOutAction.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/actions/ZoomOutAction.java
rename to images/src/org/intellij/images/editor/actions/ZoomOutAction.java
diff --git a/plugins/images/src/org/intellij/images/editor/impl/ImageEditorImpl.java b/images/src/org/intellij/images/editor/impl/ImageEditorImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/impl/ImageEditorImpl.java
rename to images/src/org/intellij/images/editor/impl/ImageEditorImpl.java
diff --git a/plugins/images/src/org/intellij/images/editor/impl/ImageEditorManagerImpl.java b/images/src/org/intellij/images/editor/impl/ImageEditorManagerImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/impl/ImageEditorManagerImpl.java
rename to images/src/org/intellij/images/editor/impl/ImageEditorManagerImpl.java
diff --git a/plugins/images/src/org/intellij/images/editor/impl/ImageEditorUI.java b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/impl/ImageEditorUI.java
rename to images/src/org/intellij/images/editor/impl/ImageEditorUI.java
diff --git a/plugins/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java b/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
rename to images/src/org/intellij/images/editor/impl/ImageFileEditorImpl.java
diff --git a/plugins/images/src/org/intellij/images/editor/impl/ImageFileEditorProvider.java b/images/src/org/intellij/images/editor/impl/ImageFileEditorProvider.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/editor/impl/ImageFileEditorProvider.java
rename to images/src/org/intellij/images/editor/impl/ImageFileEditorProvider.java
diff --git a/plugins/images/src/org/intellij/images/fileTypes/ImageDocumentationProvider.java b/images/src/org/intellij/images/fileTypes/ImageDocumentationProvider.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/fileTypes/ImageDocumentationProvider.java
rename to images/src/org/intellij/images/fileTypes/ImageDocumentationProvider.java
diff --git a/plugins/images/src/org/intellij/images/fileTypes/ImageFileTypeManager.java b/images/src/org/intellij/images/fileTypes/ImageFileTypeManager.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/fileTypes/ImageFileTypeManager.java
rename to images/src/org/intellij/images/fileTypes/ImageFileTypeManager.java
diff --git a/plugins/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java b/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java
rename to images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java
diff --git a/plugins/images/src/org/intellij/images/icons/ActualSize.png b/images/src/org/intellij/images/icons/ActualSize.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/ActualSize.png
rename to images/src/org/intellij/images/icons/ActualSize.png
diff --git a/plugins/images/src/org/intellij/images/icons/EditExternaly.png b/images/src/org/intellij/images/icons/EditExternaly.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/EditExternaly.png
rename to images/src/org/intellij/images/icons/EditExternaly.png
diff --git a/plugins/images/src/org/intellij/images/icons/ImagesConfigurable.png b/images/src/org/intellij/images/icons/ImagesConfigurable.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/ImagesConfigurable.png
rename to images/src/org/intellij/images/icons/ImagesConfigurable.png
diff --git a/plugins/images/src/org/intellij/images/icons/ImagesFileType.png b/images/src/org/intellij/images/icons/ImagesFileType.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/ImagesFileType.png
rename to images/src/org/intellij/images/icons/ImagesFileType.png
diff --git a/plugins/images/src/org/intellij/images/icons/ThumbnailBlank.png b/images/src/org/intellij/images/icons/ThumbnailBlank.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/ThumbnailBlank.png
rename to images/src/org/intellij/images/icons/ThumbnailBlank.png
diff --git a/plugins/images/src/org/intellij/images/icons/ThumbnailDirectory.png b/images/src/org/intellij/images/icons/ThumbnailDirectory.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/ThumbnailDirectory.png
rename to images/src/org/intellij/images/icons/ThumbnailDirectory.png
diff --git a/plugins/images/src/org/intellij/images/icons/ThumbnailToolWindow.png b/images/src/org/intellij/images/icons/ThumbnailToolWindow.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/ThumbnailToolWindow.png
rename to images/src/org/intellij/images/icons/ThumbnailToolWindow.png
diff --git a/plugins/images/src/org/intellij/images/icons/ToggleGrid.png b/images/src/org/intellij/images/icons/ToggleGrid.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/ToggleGrid.png
rename to images/src/org/intellij/images/icons/ToggleGrid.png
diff --git a/plugins/images/src/org/intellij/images/icons/ToggleTransparencyChessboard.png b/images/src/org/intellij/images/icons/ToggleTransparencyChessboard.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/ToggleTransparencyChessboard.png
rename to images/src/org/intellij/images/icons/ToggleTransparencyChessboard.png
diff --git a/plugins/images/src/org/intellij/images/icons/ZoomIn.png b/images/src/org/intellij/images/icons/ZoomIn.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/ZoomIn.png
rename to images/src/org/intellij/images/icons/ZoomIn.png
diff --git a/plugins/images/src/org/intellij/images/icons/ZoomOut.png b/images/src/org/intellij/images/icons/ZoomOut.png
similarity index 100%
rename from plugins/images/src/org/intellij/images/icons/ZoomOut.png
rename to images/src/org/intellij/images/icons/ZoomOut.png
diff --git a/plugins/images/src/org/intellij/images/index/ImageInfoIndex.java b/images/src/org/intellij/images/index/ImageInfoIndex.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/index/ImageInfoIndex.java
rename to images/src/org/intellij/images/index/ImageInfoIndex.java
diff --git a/plugins/images/src/org/intellij/images/options/EditorOptions.java b/images/src/org/intellij/images/options/EditorOptions.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/EditorOptions.java
rename to images/src/org/intellij/images/options/EditorOptions.java
diff --git a/plugins/images/src/org/intellij/images/options/ExternalEditorOptions.java b/images/src/org/intellij/images/options/ExternalEditorOptions.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/ExternalEditorOptions.java
rename to images/src/org/intellij/images/options/ExternalEditorOptions.java
diff --git a/plugins/images/src/org/intellij/images/options/GridOptions.java b/images/src/org/intellij/images/options/GridOptions.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/GridOptions.java
rename to images/src/org/intellij/images/options/GridOptions.java
diff --git a/plugins/images/src/org/intellij/images/options/Options.java b/images/src/org/intellij/images/options/Options.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/Options.java
rename to images/src/org/intellij/images/options/Options.java
diff --git a/plugins/images/src/org/intellij/images/options/OptionsManager.java b/images/src/org/intellij/images/options/OptionsManager.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/OptionsManager.java
rename to images/src/org/intellij/images/options/OptionsManager.java
diff --git a/plugins/images/src/org/intellij/images/options/TransparencyChessboardOptions.java b/images/src/org/intellij/images/options/TransparencyChessboardOptions.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/TransparencyChessboardOptions.java
rename to images/src/org/intellij/images/options/TransparencyChessboardOptions.java
diff --git a/plugins/images/src/org/intellij/images/options/ZoomOptions.java b/images/src/org/intellij/images/options/ZoomOptions.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/ZoomOptions.java
rename to images/src/org/intellij/images/options/ZoomOptions.java
diff --git a/plugins/images/src/org/intellij/images/options/impl/EditorOptionsImpl.java b/images/src/org/intellij/images/options/impl/EditorOptionsImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/EditorOptionsImpl.java
rename to images/src/org/intellij/images/options/impl/EditorOptionsImpl.java
diff --git a/plugins/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java b/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java
rename to images/src/org/intellij/images/options/impl/ExternalEditorOptionsImpl.java
diff --git a/plugins/images/src/org/intellij/images/options/impl/GridOptionsImpl.java b/images/src/org/intellij/images/options/impl/GridOptionsImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/GridOptionsImpl.java
rename to images/src/org/intellij/images/options/impl/GridOptionsImpl.java
diff --git a/plugins/images/src/org/intellij/images/options/impl/JDOMExternalizerEx.java b/images/src/org/intellij/images/options/impl/JDOMExternalizerEx.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/JDOMExternalizerEx.java
rename to images/src/org/intellij/images/options/impl/JDOMExternalizerEx.java
diff --git a/plugins/images/src/org/intellij/images/options/impl/Options.form b/images/src/org/intellij/images/options/impl/Options.form
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/Options.form
rename to images/src/org/intellij/images/options/impl/Options.form
diff --git a/plugins/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java b/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/OptionsConfigurabe.java
rename to images/src/org/intellij/images/options/impl/OptionsConfigurabe.java
diff --git a/plugins/images/src/org/intellij/images/options/impl/OptionsImpl.java b/images/src/org/intellij/images/options/impl/OptionsImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/OptionsImpl.java
rename to images/src/org/intellij/images/options/impl/OptionsImpl.java
diff --git a/plugins/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java b/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/OptionsManagerImpl.java
rename to images/src/org/intellij/images/options/impl/OptionsManagerImpl.java
diff --git a/plugins/images/src/org/intellij/images/options/impl/OptionsUIForm.java b/images/src/org/intellij/images/options/impl/OptionsUIForm.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/OptionsUIForm.java
rename to images/src/org/intellij/images/options/impl/OptionsUIForm.java
diff --git a/plugins/images/src/org/intellij/images/options/impl/TransparencyChessboardOptionsImpl.java b/images/src/org/intellij/images/options/impl/TransparencyChessboardOptionsImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/TransparencyChessboardOptionsImpl.java
rename to images/src/org/intellij/images/options/impl/TransparencyChessboardOptionsImpl.java
diff --git a/plugins/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java b/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java
rename to images/src/org/intellij/images/options/impl/ZoomOptionsImpl.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/ThumbnailManager.java b/images/src/org/intellij/images/thumbnail/ThumbnailManager.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/ThumbnailManager.java
rename to images/src/org/intellij/images/thumbnail/ThumbnailManager.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/ThumbnailView.java b/images/src/org/intellij/images/thumbnail/ThumbnailView.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/ThumbnailView.java
rename to images/src/org/intellij/images/thumbnail/ThumbnailView.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActionUtil.java b/images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActionUtil.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActionUtil.java
rename to images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActionUtil.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActions.java b/images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActions.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActions.java
rename to images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActions.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/actions/EnterAction.java b/images/src/org/intellij/images/thumbnail/actions/EnterAction.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/actions/EnterAction.java
rename to images/src/org/intellij/images/thumbnail/actions/EnterAction.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/actions/HideThumbnailsAction.java b/images/src/org/intellij/images/thumbnail/actions/HideThumbnailsAction.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/actions/HideThumbnailsAction.java
rename to images/src/org/intellij/images/thumbnail/actions/HideThumbnailsAction.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/actions/ToggleRecursiveAction.java b/images/src/org/intellij/images/thumbnail/actions/ToggleRecursiveAction.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/actions/ToggleRecursiveAction.java
rename to images/src/org/intellij/images/thumbnail/actions/ToggleRecursiveAction.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/actions/UpFolderAction.java b/images/src/org/intellij/images/thumbnail/actions/UpFolderAction.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/actions/UpFolderAction.java
rename to images/src/org/intellij/images/thumbnail/actions/UpFolderAction.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/impl/ThumbnailManagerImpl.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailManagerImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/impl/ThumbnailManagerImpl.java
rename to images/src/org/intellij/images/thumbnail/impl/ThumbnailManagerImpl.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/impl/ThumbnailSelectInTarget.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailSelectInTarget.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/impl/ThumbnailSelectInTarget.java
rename to images/src/org/intellij/images/thumbnail/impl/ThumbnailSelectInTarget.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewImpl.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewImpl.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewImpl.java
rename to images/src/org/intellij/images/thumbnail/impl/ThumbnailViewImpl.java
diff --git a/plugins/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
rename to images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
diff --git a/plugins/images/src/org/intellij/images/ui/ImageComponent.java b/images/src/org/intellij/images/ui/ImageComponent.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/ui/ImageComponent.java
rename to images/src/org/intellij/images/ui/ImageComponent.java
diff --git a/plugins/images/src/org/intellij/images/ui/ImageComponentDecorator.java b/images/src/org/intellij/images/ui/ImageComponentDecorator.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/ui/ImageComponentDecorator.java
rename to images/src/org/intellij/images/ui/ImageComponentDecorator.java
diff --git a/plugins/images/src/org/intellij/images/ui/ImageComponentUI.java b/images/src/org/intellij/images/ui/ImageComponentUI.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/ui/ImageComponentUI.java
rename to images/src/org/intellij/images/ui/ImageComponentUI.java
diff --git a/plugins/images/src/org/intellij/images/ui/ThumbnailComponent.java b/images/src/org/intellij/images/ui/ThumbnailComponent.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/ui/ThumbnailComponent.java
rename to images/src/org/intellij/images/ui/ThumbnailComponent.java
diff --git a/plugins/images/src/org/intellij/images/ui/ThumbnailComponentUI.java b/images/src/org/intellij/images/ui/ThumbnailComponentUI.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/ui/ThumbnailComponentUI.java
rename to images/src/org/intellij/images/ui/ThumbnailComponentUI.java
diff --git a/plugins/images/src/org/intellij/images/util/ImageInfoReader.java b/images/src/org/intellij/images/util/ImageInfoReader.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/util/ImageInfoReader.java
rename to images/src/org/intellij/images/util/ImageInfoReader.java
diff --git a/plugins/images/src/org/intellij/images/vfs/IfsUtil.java b/images/src/org/intellij/images/vfs/IfsUtil.java
similarity index 100%
rename from plugins/images/src/org/intellij/images/vfs/IfsUtil.java
rename to images/src/org/intellij/images/vfs/IfsUtil.java
diff --git a/plugins/commander/src/META-INF/plugin.xml b/plugins/commander/src/META-INF/plugin.xml
index d7f2a457b04d..d87bd706216b 100644
--- a/plugins/commander/src/META-INF/plugin.xml
+++ b/plugins/commander/src/META-INF/plugin.xml
@@ -22,6 +22,16 @@
     <action id="CommanderSwapPanels" class="com.intellij.ide.actions.SwapPanelsAction" icon="/actions/swapPanels.png">
       <add-to-group group-id="PairFileActions" anchor="first"/>
     </action>
+
+    <group id="ImagesCommanderActions1" text="Images Commander Actions (1)">
+      <reference id="Images.EditExternaly"/>
+      <add-to-group anchor="after" group-id="CommanderPopupMenu" relative-to-action="EditSource"/>
+    </group>
+
+    <group id="ImagesCommanderActions2" text="Images Commander Actions (2)">
+      <reference id="Images.ShowThumbnails"/>
+      <add-to-group anchor="after" group-id="CommanderPopupMenu" relative-to-action="AddToFavorites"/>
+    </group>
   </actions>
 </idea-plugin>
 
diff --git a/plugins/images/imagesPlugin.iml b/plugins/images/imagesPlugin.iml
deleted file mode 100644
index 4e12d30128e1..000000000000
--- a/plugins/images/imagesPlugin.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="PLUGIN_MODULE" version="4">
-  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <output url="file://$MODULE_DIR$/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntryProperties />
-  </component>
-</module>
-
diff --git a/plugins/images/src/META-INF/images-commander-integration.xml b/plugins/images/src/META-INF/images-commander-integration.xml
deleted file mode 100644
index 57fbe8a7a852..000000000000
--- a/plugins/images/src/META-INF/images-commander-integration.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE idea-plugin PUBLIC "Plugin/DTD" "http://plugins.intellij.net/plugin.dtd">
-
-<idea-plugin version="2">
-  <actions>
-    <group id="ImagesCommanderActions1" text="Images Commander Actions (1)">
-      <reference id="Images.EditExternaly"/>
-      <add-to-group anchor="after" group-id="CommanderPopupMenu" relative-to-action="EditSource"/>
-    </group>
-
-    <group id="ImagesCommanderActions2" text="Images Commander Actions (2)">
-      <reference id="Images.ShowThumbnails"/>
-      <add-to-group anchor="after" group-id="CommanderPopupMenu" relative-to-action="AddToFavorites"/>
-    </group>
-  </actions>
-
-</idea-plugin>
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 2ad476b94339..a9489a80aa7c 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -1100,4 +1100,5 @@
   <xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/DomPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/RegExpPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/ImagesPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
 </idea-plugin>
diff --git a/plugins/images/src/META-INF/plugin.xml b/resources/src/META-INF/ImagesPlugin.xml
similarity index 89%
rename from plugins/images/src/META-INF/plugin.xml
rename to resources/src/META-INF/ImagesPlugin.xml
index fd6c38e97885..528aa894faa8 100644
--- a/plugins/images/src/META-INF/plugin.xml
+++ b/resources/src/META-INF/ImagesPlugin.xml
@@ -1,13 +1,10 @@
-<idea-plugin>
+<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <vendor>Alexey Efimov</vendor>
 
   <name>Images</name>
   <version>1.1</version>
 
-  <depends>com.intellij.modules.lang</depends>
-  <depends optional="true" config-file="images-commander-integration.xml">com.intellij.commander</depends>
-
   <resource-bundle>org.intellij.images.ImagesBundle</resource-bundle>
 
   <extensions defaultExtensionNs="com.intellij">
@@ -35,42 +32,48 @@
   <actions>
     <action class="org.intellij.images.actions.EditExternalyAction"
             id="Images.EditExternaly"
-            icon="/org/intellij/images/icons/EditExternaly.png">
+            icon="/org/intellij/images/icons/EditExternaly.png"
+            text="Open image in external editor">
       <keyboard-shortcut first-keystroke="control alt F4" keymap="$default"/>
       <add-to-group anchor="after" group-id="ProjectViewPopupMenu" relative-to-action="EditSource"/>
     </action>
     <action class="org.intellij.images.actions.ShowThumbnailsAction"
-            id="Images.ShowThumbnails">
+            id="Images.ShowThumbnails" text="Show image thumbnails">
       <keyboard-shortcut first-keystroke="shift control T" keymap="$default"/>
       <add-to-group anchor="after" group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites"/>
     </action>
     <action class="org.intellij.images.actions.ToggleTransparencyChessboardAction"
             id="Images.ToggleTransparencyChessboard"
-            icon="/org/intellij/images/icons/ToggleTransparencyChessboard.png">
+            icon="/org/intellij/images/icons/ToggleTransparencyChessboard.png"
+            text="Show Chessboard">
     </action>
     <group id="Images.EditorToolbar">
       <reference id="Images.ToggleTransparencyChessboard"/>
       <action class="org.intellij.images.editor.actions.ToggleGridAction"
               id="Images.Editor.ToggleGrid"
-              icon="/org/intellij/images/icons/ToggleGrid.png">
+              icon="/org/intellij/images/icons/ToggleGrid.png"
+              text="Show Grid">
         <keyboard-shortcut first-keystroke="control QUOTE" keymap="$default"/>
       </action>
       <separator/>
       <action class="org.intellij.images.editor.actions.ZoomInAction"
               id="Images.Editor.ZoomIn"
-              icon="/org/intellij/images/icons/ZoomIn.png">
+              icon="/org/intellij/images/icons/ZoomIn.png"
+              text="Zoom In">
         <keyboard-shortcut first-keystroke="control ADD" keymap="$default"/>
         <keyboard-shortcut first-keystroke="control EQUALS" keymap="$default"/>
       </action>
       <action class="org.intellij.images.editor.actions.ZoomOutAction"
               id="Images.Editor.ZoomOut"
-              icon="/org/intellij/images/icons/ZoomOut.png">
+              icon="/org/intellij/images/icons/ZoomOut.png"
+              text="Zoom Out">
         <keyboard-shortcut first-keystroke="control SUBTRACT" keymap="$default"/>
         <keyboard-shortcut first-keystroke="control MINUS" keymap="$default"/>
       </action>
       <action class="org.intellij.images.editor.actions.ActualSizeAction"
               id="Images.Editor.ActualSize"
-              icon="/org/intellij/images/icons/ActualSize.png">
+              icon="/org/intellij/images/icons/ActualSize.png"
+              text="Zoom to actual size">
         <keyboard-shortcut first-keystroke="control DIVIDE" keymap="$default"/>
         <keyboard-shortcut first-keystroke="control SLASH" keymap="$default"/>
       </action>