diff --git a/idea/formatter/formatter.iml b/idea/formatter/formatter.iml
index 44071adbdcd..8c779a87e85 100644
--- a/idea/formatter/formatter.iml
+++ b/idea/formatter/formatter.iml
@@ -8,5 +8,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="module" module-name="idea-core" />
+    <orderEntry type="module" module-name="frontend.java" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java b/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
similarity index 98%
rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
rename to idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
index 0b34b642f73..b860a279f0c 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
similarity index 99%
rename from idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
rename to idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
index a9c94fa7e3a..9f99052894b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinSpacingBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/NodeIndentStrategy.java b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/NodeIndentStrategy.java
similarity index 99%
rename from idea/src/org/jetbrains/kotlin/idea/formatter/NodeIndentStrategy.java
rename to idea/formatter/src/org/jetbrains/kotlin/idea/formatter/NodeIndentStrategy.java
index b82c664ac1f..d695612a944 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/NodeIndentStrategy.java
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/NodeIndentStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/SyntheticKotlinBlock.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/SyntheticKotlinBlock.kt
similarity index 98%
rename from idea/src/org/jetbrains/kotlin/idea/formatter/SyntheticKotlinBlock.kt
rename to idea/formatter/src/org/jetbrains/kotlin/idea/formatter/SyntheticKotlinBlock.kt
index ee065a79fdd..2e3161a069a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/SyntheticKotlinBlock.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/SyntheticKotlinBlock.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/WrappingStrategy.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/WrappingStrategy.kt
similarity index 95%
rename from idea/src/org/jetbrains/kotlin/idea/formatter/WrappingStrategy.kt
rename to idea/formatter/src/org/jetbrains/kotlin/idea/formatter/WrappingStrategy.kt
index f749ce9407f..707737a4191 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/WrappingStrategy.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/WrappingStrategy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
similarity index 99%
rename from idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
rename to idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 57a035bc6cc..fb36b1f803d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/idea/idea-completion/idea-completion.iml b/idea/idea-completion/idea-completion.iml
index 4de4dd9e166..ff92562197a 100644
--- a/idea/idea-completion/idea-completion.iml
+++ b/idea/idea-completion/idea-completion.iml
@@ -24,5 +24,6 @@
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
     <orderEntry type="module" module-name="idea" scope="RUNTIME" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
+    <orderEntry type="module" module-name="formatter" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea.iml b/idea/idea.iml
index c7647a65893..c812377c270 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -52,5 +52,6 @@
     <orderEntry type="module" module-name="tests-common" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="lint-idea" scope="PROVIDED" />
+    <orderEntry type="module" module-name="formatter" />
   </component>
 </module>
\ No newline at end of file