diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml
index d6bec7a7e296..736ed95cbd5f 100644
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/generate-to-string" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/java/java-impl/generate-to-string/org/jetbrains/generate/tostring/GenerateToStringClassFilter.java b/java/java-impl/src/org/jetbrains/generate/tostring/GenerateToStringClassFilter.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/generate/tostring/GenerateToStringClassFilter.java
rename to java/java-impl/src/org/jetbrains/generate/tostring/GenerateToStringClassFilter.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/generate/tostring/GenerateToStringInterfaceFilter.java b/java/java-impl/src/org/jetbrains/generate/tostring/GenerateToStringInterfaceFilter.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/generate/tostring/GenerateToStringInterfaceFilter.java
rename to java/java-impl/src/org/jetbrains/generate/tostring/GenerateToStringInterfaceFilter.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/GenerateToStringAction.java b/java/java-impl/src/org/jetbrains/java/generate/GenerateToStringAction.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/GenerateToStringAction.java
rename to java/java-impl/src/org/jetbrains/java/generate/GenerateToStringAction.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/GenerateToStringActionHandlerImpl.java b/java/java-impl/src/org/jetbrains/java/generate/GenerateToStringActionHandlerImpl.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/GenerateToStringActionHandlerImpl.java
rename to java/java-impl/src/org/jetbrains/java/generate/GenerateToStringActionHandlerImpl.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/GenerateToStringConfigurable.java b/java/java-impl/src/org/jetbrains/java/generate/GenerateToStringConfigurable.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/GenerateToStringConfigurable.java
rename to java/java-impl/src/org/jetbrains/java/generate/GenerateToStringConfigurable.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/GenerateToStringWorker.java b/java/java-impl/src/org/jetbrains/java/generate/GenerateToStringWorker.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/GenerateToStringWorker.java
rename to java/java-impl/src/org/jetbrains/java/generate/GenerateToStringWorker.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/GenerationUtil.java b/java/java-impl/src/org/jetbrains/java/generate/GenerationUtil.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/GenerationUtil.java
rename to java/java-impl/src/org/jetbrains/java/generate/GenerationUtil.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/config/DuplicatePolicy.java b/java/java-impl/src/org/jetbrains/java/generate/config/DuplicatePolicy.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/config/DuplicatePolicy.java
rename to java/java-impl/src/org/jetbrains/java/generate/config/DuplicatePolicy.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/config/InsertAfterEqualsHashCodeStrategy.java b/java/java-impl/src/org/jetbrains/java/generate/config/InsertAfterEqualsHashCodeStrategy.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/config/InsertAfterEqualsHashCodeStrategy.java
rename to java/java-impl/src/org/jetbrains/java/generate/config/InsertAfterEqualsHashCodeStrategy.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/config/InsertAtCaretStrategy.java b/java/java-impl/src/org/jetbrains/java/generate/config/InsertAtCaretStrategy.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/config/InsertAtCaretStrategy.java
rename to java/java-impl/src/org/jetbrains/java/generate/config/InsertAtCaretStrategy.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/config/ReplacePolicy.java b/java/java-impl/src/org/jetbrains/java/generate/config/ReplacePolicy.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/config/ReplacePolicy.java
rename to java/java-impl/src/org/jetbrains/java/generate/config/ReplacePolicy.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/element/AbstractElement.java b/java/java-impl/src/org/jetbrains/java/generate/element/AbstractElement.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/element/AbstractElement.java
rename to java/java-impl/src/org/jetbrains/java/generate/element/AbstractElement.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/element/ClassElement.java b/java/java-impl/src/org/jetbrains/java/generate/element/ClassElement.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/element/ClassElement.java
rename to java/java-impl/src/org/jetbrains/java/generate/element/ClassElement.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/element/Element.java b/java/java-impl/src/org/jetbrains/java/generate/element/Element.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/element/Element.java
rename to java/java-impl/src/org/jetbrains/java/generate/element/Element.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/element/ElementComparator.java b/java/java-impl/src/org/jetbrains/java/generate/element/ElementComparator.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/element/ElementComparator.java
rename to java/java-impl/src/org/jetbrains/java/generate/element/ElementComparator.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/element/ElementFactory.java b/java/java-impl/src/org/jetbrains/java/generate/element/ElementFactory.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/element/ElementFactory.java
rename to java/java-impl/src/org/jetbrains/java/generate/element/ElementFactory.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/element/ElementUtils.java b/java/java-impl/src/org/jetbrains/java/generate/element/ElementUtils.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/element/ElementUtils.java
rename to java/java-impl/src/org/jetbrains/java/generate/element/ElementUtils.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/element/FieldElement.java b/java/java-impl/src/org/jetbrains/java/generate/element/FieldElement.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/element/FieldElement.java
rename to java/java-impl/src/org/jetbrains/java/generate/element/FieldElement.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/element/GenerationHelper.java b/java/java-impl/src/org/jetbrains/java/generate/element/GenerationHelper.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/element/GenerationHelper.java
rename to java/java-impl/src/org/jetbrains/java/generate/element/GenerationHelper.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/element/MethodElement.java b/java/java-impl/src/org/jetbrains/java/generate/element/MethodElement.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/element/MethodElement.java
rename to java/java-impl/src/org/jetbrains/java/generate/element/MethodElement.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/exception/TemplateResourceException.java b/java/java-impl/src/org/jetbrains/java/generate/exception/TemplateResourceException.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/exception/TemplateResourceException.java
rename to java/java-impl/src/org/jetbrains/java/generate/exception/TemplateResourceException.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/package.html b/java/java-impl/src/org/jetbrains/java/generate/package.html
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/package.html
rename to java/java-impl/src/org/jetbrains/java/generate/package.html
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/TemplateResource.java b/java/java-impl/src/org/jetbrains/java/generate/template/TemplateResource.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/TemplateResource.java
rename to java/java-impl/src/org/jetbrains/java/generate/template/TemplateResource.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/TemplatesManager.java b/java/java-impl/src/org/jetbrains/java/generate/template/TemplatesManager.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/TemplatesManager.java
rename to java/java-impl/src/org/jetbrains/java/generate/template/TemplatesManager.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/TemplatesState.java b/java/java-impl/src/org/jetbrains/java/generate/template/TemplatesState.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/TemplatesState.java
rename to java/java-impl/src/org/jetbrains/java/generate/template/TemplatesState.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultBuffer.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultBuffer.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultBuffer.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultBuffer.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultBuilder.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultBuilder.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultBuilder.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultBuilder.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultConcatMember.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultConcatMember.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultConcatMember.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultConcatMember.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultConcatMemberGroovy.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultConcatMemberGroovy.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultConcatMemberGroovy.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultConcatMemberGroovy.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultConcatMemberSuper.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultConcatMemberSuper.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultConcatMemberSuper.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultConcatMemberSuper.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultConcatMemberSuperGroovy.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultConcatMemberSuperGroovy.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultConcatMemberSuperGroovy.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultConcatMemberSuperGroovy.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultGuava.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultGuava.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultGuava.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultGuava.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultGuava18.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultGuava18.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultGuava18.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultGuava18.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultToStringBuilder.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultToStringBuilder.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultToStringBuilder.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultToStringBuilder.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultToStringBuilder3.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultToStringBuilder3.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/DefaultToStringBuilder3.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/DefaultToStringBuilder3.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/StringJoiner.vm b/java/java-impl/src/org/jetbrains/java/generate/template/toString/StringJoiner.vm
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/StringJoiner.vm
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/StringJoiner.vm
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java b/java/java-impl/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java
rename to java/java-impl/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/velocity/VelocityFactory.java b/java/java-impl/src/org/jetbrains/java/generate/velocity/VelocityFactory.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/velocity/VelocityFactory.java
rename to java/java-impl/src/org/jetbrains/java/generate/velocity/VelocityFactory.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/view/ConfigUI.java b/java/java-impl/src/org/jetbrains/java/generate/view/ConfigUI.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/view/ConfigUI.java
rename to java/java-impl/src/org/jetbrains/java/generate/view/ConfigUI.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/view/GenerateTemplateConfigurable.java b/java/java-impl/src/org/jetbrains/java/generate/view/GenerateTemplateConfigurable.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/view/GenerateTemplateConfigurable.java
rename to java/java-impl/src/org/jetbrains/java/generate/view/GenerateTemplateConfigurable.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/view/MethodExistsDialog.java b/java/java-impl/src/org/jetbrains/java/generate/view/MethodExistsDialog.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/view/MethodExistsDialog.java
rename to java/java-impl/src/org/jetbrains/java/generate/view/MethodExistsDialog.java
diff --git a/java/java-impl/generate-to-string/org/jetbrains/java/generate/view/TemplatesPanel.java b/java/java-impl/src/org/jetbrains/java/generate/view/TemplatesPanel.java
similarity index 100%
rename from java/java-impl/generate-to-string/org/jetbrains/java/generate/view/TemplatesPanel.java
rename to java/java-impl/src/org/jetbrains/java/generate/view/TemplatesPanel.java
diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index 3ce82aa33235..171400b25dc9 100644
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -6,7 +6,6 @@
       <sourceFolder url="file://$MODULE_DIR$/testData/inspection" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/testGen" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/generate-to-string" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/testSrc/com/intellij/java/codeInspection/bytecodeAnalysis/precompiledData" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/java/java-tests/generate-to-string/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspectionTest.java b/java/java-tests/testSrc/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspectionTest.java
similarity index 100%
rename from java/java-tests/generate-to-string/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspectionTest.java
rename to java/java-tests/testSrc/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspectionTest.java
diff --git a/java/java-tests/generate-to-string/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspectionTest.java b/java/java-tests/testSrc/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspectionTest.java
similarity index 100%
rename from java/java-tests/generate-to-string/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspectionTest.java
rename to java/java-tests/testSrc/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspectionTest.java
diff --git a/java/java-tests/generate-to-string/org/jetbrains/java/generate/inspection/ToStringGeneratingTest.java b/java/java-tests/testSrc/org/jetbrains/java/generate/inspection/ToStringGeneratingTest.java
similarity index 100%
rename from java/java-tests/generate-to-string/org/jetbrains/java/generate/inspection/ToStringGeneratingTest.java
rename to java/java-tests/testSrc/org/jetbrains/java/generate/inspection/ToStringGeneratingTest.java
diff --git a/java/java-tests/generate-to-string/org/jetbrains/java/generate/test/DummyCompleteTestBean.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyCompleteTestBean.java
similarity index 100%
rename from java/java-tests/generate-to-string/org/jetbrains/java/generate/test/DummyCompleteTestBean.java
rename to java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyCompleteTestBean.java
diff --git a/java/java-tests/generate-to-string/org/jetbrains/java/generate/test/DummyGetterTestBean.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyGetterTestBean.java
similarity index 100%
rename from java/java-tests/generate-to-string/org/jetbrains/java/generate/test/DummyGetterTestBean.java
rename to java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyGetterTestBean.java
diff --git a/java/java-tests/generate-to-string/org/jetbrains/java/generate/test/DummyModelTestBean.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyModelTestBean.java
similarity index 100%
rename from java/java-tests/generate-to-string/org/jetbrains/java/generate/test/DummyModelTestBean.java
rename to java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyModelTestBean.java
diff --git a/java/java-tests/generate-to-string/org/jetbrains/java/generate/test/DummySortTestBean.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummySortTestBean.java
similarity index 100%
rename from java/java-tests/generate-to-string/org/jetbrains/java/generate/test/DummySortTestBean.java
rename to java/java-tests/testSrc/org/jetbrains/java/generate/test/DummySortTestBean.java
diff --git a/java/java-tests/generate-to-string/org/jetbrains/java/generate/test/DummyTestBean.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyTestBean.java
similarity index 100%
rename from java/java-tests/generate-to-string/org/jetbrains/java/generate/test/DummyTestBean.java
rename to java/java-tests/testSrc/org/jetbrains/java/generate/test/DummyTestBean.java
diff --git a/java/java-tests/generate-to-string/org/jetbrains/java/generate/test/Owner.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/Owner.java
similarity index 100%
rename from java/java-tests/generate-to-string/org/jetbrains/java/generate/test/Owner.java
rename to java/java-tests/testSrc/org/jetbrains/java/generate/test/Owner.java
diff --git a/java/java-tests/generate-to-string/org/jetbrains/java/generate/test/Pet.java b/java/java-tests/testSrc/org/jetbrains/java/generate/test/Pet.java
similarity index 100%
rename from java/java-tests/generate-to-string/org/jetbrains/java/generate/test/Pet.java
rename to java/java-tests/testSrc/org/jetbrains/java/generate/test/Pet.java