diff --git a/conditional_operator_intention/src/main/java/org/intellij/sdk/intention/ConditionalOperatorConverter.java b/conditional_operator_intention/src/main/java/org/intellij/sdk/intention/ConditionalOperatorConverter.java
index f31a3319a..827c7a9aa 100644
--- a/conditional_operator_intention/src/main/java/org/intellij/sdk/intention/ConditionalOperatorConverter.java
+++ b/conditional_operator_intention/src/main/java/org/intellij/sdk/intention/ConditionalOperatorConverter.java
@@ -97,7 +97,7 @@ public class ConditionalOperatorConverter extends PsiElementBaseIntentionAction
    *   when manipulation of the psi tree fails.
    *   @see ConditionalOperatorConverter#startInWriteAction()
    */
-  public void invoke(@NotNull Project project, Editor editor, PsiElement element) throws IncorrectOperationException {
+  public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException {
 
     // Get the factory for making new PsiElements, and the code style manager to format new statements
     final PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
diff --git a/module/src/main/java/org/intellij/sdk/module/DemoModuleBuilder.java b/module/src/main/java/org/intellij/sdk/module/DemoModuleBuilder.java
index ff93bb49c..e06987e92 100644
--- a/module/src/main/java/org/intellij/sdk/module/DemoModuleBuilder.java
+++ b/module/src/main/java/org/intellij/sdk/module/DemoModuleBuilder.java
@@ -7,11 +7,12 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.roots.ModifiableRootModel;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class DemoModuleBuilder extends ModuleBuilder {
   @Override
-  public void setupRootModel(ModifiableRootModel model) throws ConfigurationException {
+  public void setupRootModel(@NotNull ModifiableRootModel model) throws ConfigurationException {
 
   }
 
diff --git a/module/src/main/java/org/intellij/sdk/module/DemoModuleType.java b/module/src/main/java/org/intellij/sdk/module/DemoModuleType.java
index 62fac13a3..1e3877171 100644
--- a/module/src/main/java/org/intellij/sdk/module/DemoModuleType.java
+++ b/module/src/main/java/org/intellij/sdk/module/DemoModuleType.java
@@ -2,9 +2,10 @@
 
 package org.intellij.sdk.module;
 
-import com.intellij.icons.AllIcons;
-import com.intellij.ide.util.projectWizard.*;
-import com.intellij.openapi.module.*;
+import com.intellij.ide.util.projectWizard.ModuleWizardStep;
+import com.intellij.ide.util.projectWizard.WizardContext;
+import com.intellij.openapi.module.ModuleType;
+import com.intellij.openapi.module.ModuleTypeManager;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
 import icons.SdkIcons;
 import org.jetbrains.annotations.NotNull;
@@ -41,6 +42,7 @@ public class DemoModuleType extends ModuleType<DemoModuleBuilder> {
   }
 
 
+  @NotNull
   @Override
   public Icon getNodeIcon(@Deprecated boolean b) {
     return SdkIcons.Sdk_default_icon;
diff --git a/project_wizard/src/main/java/org/intellij/sdk/project/wizard/DemoModuleWizardStep.java b/project_wizard/src/main/java/org/intellij/sdk/project/wizard/DemoModuleWizardStep.java
index 3977f0870..c0c63d950 100644
--- a/project_wizard/src/main/java/org/intellij/sdk/project/wizard/DemoModuleWizardStep.java
+++ b/project_wizard/src/main/java/org/intellij/sdk/project/wizard/DemoModuleWizardStep.java
@@ -2,7 +2,9 @@
 
 package org.intellij.sdk.project.wizard;
 
-import com.intellij.ide.util.projectWizard.*;
+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;
@@ -15,7 +17,7 @@ import javax.swing.*;
  * @author Anna Bulenkova
  */
 public class DemoModuleWizardStep extends ModuleBuilder {
-  public void setupRootModel(ModifiableRootModel modifiableRootModel) throws ConfigurationException {
+  public void setupRootModel(@NotNull ModifiableRootModel modifiableRootModel) throws ConfigurationException {
 
   }
 
diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java
index 336c4b69f..9e310067c 100644
--- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java
+++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java
@@ -15,7 +15,7 @@ public class SimpleCompletionContributor extends CompletionContributor {
             PlatformPatterns.psiElement(SimpleTypes.VALUE).withLanguage(SimpleLanguage.INSTANCE),
             new CompletionProvider<CompletionParameters>() {
                   public void addCompletions(@NotNull CompletionParameters parameters,
-                                             ProcessingContext context,
+                                             @NotNull ProcessingContext context,
                                              @NotNull CompletionResultSet resultSet) {
                     resultSet.addElement(LookupElementBuilder.create("Hello"));
                   }
diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java
index 91479641a..af84f5b09 100644
--- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java
+++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java
@@ -58,6 +58,7 @@ public class SimpleStructureViewElement implements StructureViewTreeElement, Sor
     return presentation != null ? presentation : new PresentationData();
   }
 
+  @NotNull
   @Override
   public TreeElement[] getChildren() {
     if (myElement instanceof SimpleFile) {
diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewFactory.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewFactory.java
index 5dadda2dc..9d351df69 100644
--- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewFactory.java
+++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewFactory.java
@@ -2,16 +2,19 @@
 
 package org.intellij.sdk.language;
 
-import com.intellij.ide.structureView.*;
+import com.intellij.ide.structureView.StructureViewBuilder;
+import com.intellij.ide.structureView.StructureViewModel;
+import com.intellij.ide.structureView.TreeBasedStructureViewBuilder;
 import com.intellij.lang.PsiStructureViewFactory;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiFile;
-import org.jetbrains.annotations.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class SimpleStructureViewFactory implements PsiStructureViewFactory {
   @Nullable
   @Override
-  public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) {
+  public StructureViewBuilder getStructureViewBuilder(@NotNull final PsiFile psiFile) {
     return new TreeBasedStructureViewBuilder() {
       @NotNull
       @Override