diff --git a/gradle_plugin_demo/build.gradle b/gradle_plugin_demo/build.gradle
index 3ac60dcc8..172dddd9c 100644
--- a/gradle_plugin_demo/build.gradle
+++ b/gradle_plugin_demo/build.gradle
@@ -1,16 +1,3 @@
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-    maven {
-      url 'http://dl.bintray.com/jetbrains/intellij-plugin-service'
-    }
-
-  }
-  dependencies {
-    classpath "gradle.plugin.org.jetbrains:gradle-intellij-plugin:0.1.10"
-  }
+plugins {
+  id "org.jetbrains.intellij" version "0.2.18"
 }
-
-apply plugin: 'org.jetbrains.intellij'
\ No newline at end of file
diff --git a/gradle_plugin_demo/gradle_plugin_demo.iml b/gradle_plugin_demo/gradle_plugin_demo.iml
index 386fdbbad..a7b8f721f 100644
--- a/gradle_plugin_demo/gradle_plugin_demo.iml
+++ b/gradle_plugin_demo/gradle_plugin_demo.iml
@@ -1,124 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="gradle_plugin_demo" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="org.jetbrains" external.system.module.version="0.0.1-SNAPSHOT" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="gradle_plugin_demo" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" 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/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:annotations:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:asm-all:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:asm-commons:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:asm:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:asm4-all:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:automaton:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:boot:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:bootstrap:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:cglib-2.2.2:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:cli-parser-1.1:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:commons-codec-1.9:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:commons-httpclient-3.1-patched:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:commons-logging-1.2:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:commons-net-3.3:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:coverage-agent:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:coverage-instrumenter:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:coverage-util:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:ecj-4.4:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:extensions:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:fluent-hc-4.4.1:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:forms_rt:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:groovy-all-2.3.9:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:gson-2.3.1:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:guava-17.0:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:hamcrest-core-1.3:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:httpclient-4.4.1:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:httpcore-4.4.1:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:httpmime-4.4.1:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:icons:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:idea:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:idea_rt:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:imgscalr-lib-4.2:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:isorelax:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:javac2:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jaxen-1.1.3:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jayatana-1.2.4:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jcip-annotations:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jdkAnnotations:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jdom:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jgoodies-common-1.2.1:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jgoodies-forms:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jgoodies-looks-2.4.2:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jh:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jing:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jna-platform:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jna:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jps-builders:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jps-launcher:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jps-model:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jsch-0.1.52:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.connector-factory:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.core:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.pageant:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.sshagent:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.usocket-jna:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jsch.agentproxy.usocket-nc:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jsr166e:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jsr173_1.0_api:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:junit-4.12:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:junit:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:jzlib-1.1.1:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:kotlin-reflect:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:kotlin-runtime:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:log4j:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:markdown4j-2.2:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:markdownj-core-0.4.2-SNAPSHOT:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:microba:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:miglayout-swing:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:nanoxml-2.2.3:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:nekohtml-1.9.14:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:netty-all-4.1.0.Beta6:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:openapi:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:optimizedFileManager:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:oromatcher:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:picocontainer:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:protobuf-2.5.0:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:proxy-vole_20131209:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:pty4j-0.5:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:purejavacomm:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:resolver:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:resources:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:resources_en:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:rhino-js-1_7R4:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:rngom-20051226-patched:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:sanselan-0.98-snapshot:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:serviceMessages:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:slf4j-api-1.7.10:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:slf4j-log4j12-1.7.10:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:snappy-in-java-0.3.1:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:swingx-core-1.6.2:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:trang-core:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:trove4j:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:util:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:velocity:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:winp-1.23:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:xbean:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:xercesImpl:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:xml-apis:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:xmlrpc-2.0:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:xpp3-1.1.4-min:15.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.jetbrains:xstream-1.4.3:15.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.jetbrains:coverage-report-idea:15.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.jetbrains:coverage-report:15.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.jetbrains:coverage:15.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.jetbrains:coverage_rt:15.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.jetbrains:freemarker:15.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.jetbrains:jacocoagent:15.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.jetbrains:jacocoant:15.0.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.jetbrains:tools:15.0.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/gradle_plugin_demo/src/main/java/HelloAction.java b/gradle_plugin_demo/src/main/java/HelloAction.java
index c7f956120..c8a4ef356 100644
--- a/gradle_plugin_demo/src/main/java/HelloAction.java
+++ b/gradle_plugin_demo/src/main/java/HelloAction.java
@@ -8,7 +8,7 @@ public class HelloAction extends AnAction {
   }
 
   public void actionPerformed(AnActionEvent event) {
-    Project project = event.getData(PlatformDataKeys.PROJECT);
+    Project project = event.getProject();
     Messages.showMessageDialog(project, "Hello world!", "Greeting", Messages.getInformationIcon());
   }
 }
\ No newline at end of file