diff --git a/project_wizard/META-INF/plugin.xml b/project_wizard/META-INF/plugin.xml
index 7df902cd7..63ac241ac 100644
--- a/project_wizard/META-INF/plugin.xml
+++ b/project_wizard/META-INF/plugin.xml
@@ -14,7 +14,7 @@
 
   <extensions defaultExtensionNs="com.intellij">
     <!-- Add your extensions here -->
-      <moduleType id="DEMO_MODULE" implementationClass="org.jetbrains.tutorials.project.wizard.DemoModuleType"/>
+      <moduleBuilder builderClass="org.jetbrains.tutorials.project.wizard.DemoModuleWizardStep" id="DEMO_STEP" order="first"/>
   </extensions>
 
   <application-components>
diff --git a/project_wizard/src/org/jetbrains/tutorials/project/wizard/DemoModuleBuilder.java b/project_wizard/src/org/jetbrains/tutorials/project/wizard/DemoModuleBuilder.java
deleted file mode 100644
index 50a9014c0..000000000
--- a/project_wizard/src/org/jetbrains/tutorials/project/wizard/DemoModuleBuilder.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jetbrains.tutorials.project.wizard;
-
-import com.intellij.ide.util.projectWizard.JavaModuleBuilder;
-import com.intellij.ide.util.projectWizard.ModuleBuilderListener;
-import com.intellij.ide.util.projectWizard.ModuleWizardStep;
-import com.intellij.ide.util.projectWizard.WizardContext;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author Anna Bulenkova
- */
-public class DemoModuleBuilder extends JavaModuleBuilder implements ModuleBuilderListener {
-    @Override
-    public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) {
-        return new ModuleWizardStep[]{new DemoModuleWizardStep(this)};
-    }
-
-    @Override
-    public void moduleCreated(@NotNull Module module) {
-
-    }
-}
diff --git a/project_wizard/src/org/jetbrains/tutorials/project/wizard/DemoModuleType.java b/project_wizard/src/org/jetbrains/tutorials/project/wizard/DemoModuleType.java
deleted file mode 100644
index 62c444ecc..000000000
--- a/project_wizard/src/org/jetbrains/tutorials/project/wizard/DemoModuleType.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.jetbrains.tutorials.project.wizard;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.openapi.module.ModuleType;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-
-/**
- * @author Anna Bulenkova
- */
-public class DemoModuleType extends ModuleType<DemoModuleBuilder> {
-    public DemoModuleType() {
-        super("DEMO_MODULE");
-    }
-
-    @NotNull
-    @Override
-    public DemoModuleBuilder createModuleBuilder() {
-        return new DemoModuleBuilder();
-    }
-
-    @NotNull
-    @Override
-    public String getName() {
-        return "Demo";
-    }
-
-    @NotNull
-    @Override
-    public String getDescription() {
-        return "Demo module for educational purposes";
-    }
-
-    @Override
-    public Icon getBigIcon() {
-        return null;
-    }
-
-    @Override
-    public Icon getNodeIcon(@Deprecated boolean isOpened) {
-        return AllIcons.General.Information;
-    }
-}
diff --git a/project_wizard/src/org/jetbrains/tutorials/project/wizard/DemoModuleWizardStep.java b/project_wizard/src/org/jetbrains/tutorials/project/wizard/DemoModuleWizardStep.java
index fd169375c..6fb234c78 100644
--- a/project_wizard/src/org/jetbrains/tutorials/project/wizard/DemoModuleWizardStep.java
+++ b/project_wizard/src/org/jetbrains/tutorials/project/wizard/DemoModuleWizardStep.java
@@ -1,25 +1,40 @@
 package org.jetbrains.tutorials.project.wizard;
 
+import com.intellij.ide.util.projectWizard.ModuleBuilder;
 import com.intellij.ide.util.projectWizard.ModuleWizardStep;
+import com.intellij.ide.util.projectWizard.WizardContext;
+import com.intellij.openapi.module.ModuleType;
+import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.openapi.roots.ModifiableRootModel;
+import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 
 /**
  * @author Anna Bulenkova
  */
-public class DemoModuleWizardStep extends ModuleWizardStep {
-    private DemoModuleBuilder myBuilder;
-    public DemoModuleWizardStep(DemoModuleBuilder builder) {
-        myBuilder = builder;
+public class DemoModuleWizardStep extends ModuleBuilder {
+    public void setupRootModel(ModifiableRootModel modifiableRootModel) throws ConfigurationException {
+
+    }
+
+    public ModuleType getModuleType() {
+        return ModuleType.EMPTY; //or it could be other module type
     }
 
     @Override
-    public JComponent getComponent() {
-        return new JPanel();
-    }
+    public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) {
+        return new ModuleWizardStep[]{new ModuleWizardStep() {
+            @Override
+            public JComponent getComponent() {
+                  return new JLabel("Put your content here");
+            }
 
-    @Override
-    public void updateDataModel() {
+            @Override
+            public void updateDataModel() {
 
+            }
+        }};
     }
 }