Issue #2161: unify test input locations

59 files changed, 60 insertions, 60 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/IndentationCorrectIfAndParameterInput.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCorrectIfAndParameterInput.java
index 0d8549196..2ca8a49af 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/IndentationCorrectIfAndParameterInput.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCorrectIfAndParameterInput.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/Input15Extensions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/Input15Extensions.java
index e876e5d17..2d36b8d30 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/Input15Extensions.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/Input15Extensions.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputAndroidStyle.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAndroidStyle.java
index bd702a9ec..080578e30 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputAndroidStyle.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAndroidStyle.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputAnnotationDefinition.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnnotationDefinition.java
index 1ae44f68e..c66a7a118 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputAnnotationDefinition.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnnotationDefinition.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 @interface AnnotationDefinition { //indent:0 exp:0
     int value = 1; //indent:4 exp:4
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputAnonymousClassInMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnonymousClassInMethod.java
index 44514f1ab..1ae7240db 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputAnonymousClassInMethod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnonymousClassInMethod.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.io.File; //indent:0 exp:0
 import java.io.FileFilter; //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputAnonymousClasses.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnonymousClasses.java
index 0cad8222b..9ef734961 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputAnonymousClasses.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputAnonymousClasses.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputArrays.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputArrays.java
index 6abd22b5b..c784e9501 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputArrays.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputArrays.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputBraceAdjustment.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputBraceAdjustment.java
index b9da3c87c..7dd282c8a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputBraceAdjustment.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputBraceAdjustment.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputCaseLevel.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCaseLevel.java
index db406ec38..991f947d7 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputCaseLevel.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCaseLevel.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputClassesMethods.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputClassesMethods.java
index 056e336b2..de0095869 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputClassesMethods.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputClassesMethods.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.util.Iterator;  //indent:0 exp:0
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/comments/InputCommentsIndentationCheckSurroundingCode.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationCheckSurroundingCode.java
index b319aacc7..fe9bdf8e8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/comments/InputCommentsIndentationCheckSurroundingCode.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationCheckSurroundingCode.java
@@ -1,5 +1,5 @@
 // comment
-package com.puppycrawl.tools.checkstyle.comments;
+package com.puppycrawl.tools.checkstyle.checks.indentation;
 
 import java.util.*;
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/comments/InputCommentsIndentationTestNpe.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationTestNpe.java
index 980e82b01..cc5a5fe03 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/comments/InputCommentsIndentationTestNpe.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputCommentsIndentationTestNpe.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.puppycrawl.tools.checkstyle.comments;
+package com.puppycrawl.tools.checkstyle.checks.indentation;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputDifficultAnnotations.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputDifficultAnnotations.java
index dd0abd7ef..41f1fe890 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputDifficultAnnotations.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputDifficultAnnotations.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputFromGuava.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputFromGuava.java
index 576f78488..9bd30ac1d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputFromGuava.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputFromGuava.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.util.AbstractMap; //indent:0 exp:0
 import java.util.Set; //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputFromGuava2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputFromGuava2.java
index 41c33921b..8d363a061 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputFromGuava2.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputFromGuava2.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.util.Map; //indent:0 exp:0
 import java.util.Map.Entry; //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidAnonymousClassIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidAnonymousClassIndent.java
index 454eeec8a..550803588 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidAnonymousClassIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidAnonymousClassIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.util.concurrent.ThreadFactory; //indent:0 exp:0
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidArrayInitIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidArrayInitIndent.java
index c97c9853a..a3c0cfe0c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidArrayInitIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidArrayInitIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidAssignIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidAssignIndent.java
index 8ecec26e1..e8252073e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidAssignIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidAssignIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidBlockIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidBlockIndent.java
index c92b8cf49..f75a65e8d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidBlockIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidBlockIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidClassDefIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidClassDefIndent.java
index 565a87433..c5b5224a0 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidClassDefIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidClassDefIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.awt.event.ActionEvent; //indent:0 exp:0
 import java.awt.event.ActionListener; //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidForIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidForIndent.java
index b7ce12b03..492b4c18d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidForIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidForIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidIfIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidIfIndent.java
index 51290cafe..100535b9d 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidIfIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidIfIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 
 /**                                                                           //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidImportIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidImportIndent.java
index 1dfda4386..2a3830b4c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidImportIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidImportIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.util //indent:0 exp:0
   .RandomAccess; //indent:2 exp:8 warn
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidLabelIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidLabelIndent.java
index db9247001..cf1d27589 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidLabelIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidLabelIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidLabelWithWhileLoopIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidLabelWithWhileLoopIndent.java
index cb88fd88e..79db51742 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidLabelWithWhileLoopIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidLabelWithWhileLoopIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidMethodIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidMethodIndent.java
index 642e22f32..ff428ae74 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidMethodIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidMethodIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.util.Arrays; //indent:0 exp:0
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidSwitchIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidSwitchIndent.java
index 6726efe83..6d73b0dd3 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidSwitchIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidSwitchIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidTryIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidTryIndent.java
index 2e6d34bf6..5e6da9768 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidTryIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidTryIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidWhileIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidWhileIndent.java
index 64e222713..d367c8040 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputInvalidWhileIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputInvalidWhileIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputLabels.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputLabels.java
index 5afbc0295..5e8ab6631 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputLabels.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputLabels.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputMembers.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputMembers.java
index f6478937b..88d54776e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputMembers.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputMembers.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 import java.util.HashMap; //indent:0 exp:0
 import java.util.Map; //indent:0 exp:0
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputMethodCStyle.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputMethodCStyle.java
index 6f588e6b9..6c48afcbc 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputMethodCStyle.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputMethodCStyle.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 
 /**                                                                           //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputMethodCallLineWrap.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputMethodCallLineWrap.java
index 12ba8f869..92bbf81ba 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputMethodCallLineWrap.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputMethodCallLineWrap.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 
 /**                                                                           //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputPackageDeclaration.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputPackageDeclaration.java
new file mode 100644
index 000000000..4e291cd91
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputPackageDeclaration.java
@@ -0,0 +1,3 @@
+ package com.puppycrawl.tools.checkstyle.checks.indentation;//indent:1 exp:0 warn
+
+public class InputPackageDeclaration {}//indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputSwitchCustom.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputSwitchCustom.java
index c3976777c..620fb45ee 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputSwitchCustom.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputSwitchCustom.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputSynchronizedMethod.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputSynchronizedMethod.java
index 9a9118da8..be738b978 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputSynchronizedMethod.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputSynchronizedMethod.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation;//indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation;//indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputSynchronizedStatement.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputSynchronizedStatement.java
index d88d099c1..496e85147 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputSynchronizedStatement.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputSynchronizedStatement.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 
 /**                                                                           //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputUseTabs.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputUseTabs.java
index cdc3da3d3..b871d5def 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputUseTabs.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputUseTabs.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputUseTwoSpaces.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputUseTwoSpaces.java
index f52c2ee2d..528bda87c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputUseTwoSpaces.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputUseTwoSpaces.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidArrayInitDefaultIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidArrayInitDefaultIndent.java
index 67b9361fa..eb60ef08c 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidArrayInitDefaultIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidArrayInitDefaultIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidArrayInitIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidArrayInitIndent.java
index eb76a7864..a60f8ac0f 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidArrayInitIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidArrayInitIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidAssignIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidAssignIndent.java
index 1036009f2..3f58cb1c1 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidAssignIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidAssignIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidBlockIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidBlockIndent.java
index fbbfaad85..d85c26680 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidBlockIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidBlockIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidClassDefIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidClassDefIndent.java
index 91b214675..035d42b3e 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidClassDefIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidClassDefIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.awt.event.ActionEvent; //indent:0 exp:0
 import java.awt.event.ActionListener; //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidCommaIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidCommaIndent.java
index a0755ec5a..5de927ad6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidCommaIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidCommaIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidDoWhileIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidDoWhileIndent.java
index 4eb9a74d4..5c3f4e48a 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidDoWhileIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidDoWhileIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidDotIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidDotIndent.java
index ce1174327..c334a0e53 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidDotIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidDotIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import javax.swing.border.BevelBorder; //indent:0 exp:0
 import javax.swing.plaf.metal.MetalButtonUI; //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidForIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidForIndent.java
index 40f132290..31f040ebf 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidForIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidForIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidIfIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidIfIndent.java
index ec374dfa0..ac7c65fa6 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidIfIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidIfIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidInterfaceDefIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidInterfaceDefIndent.java
index 35bd548bd..cb57cbfa9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidInterfaceDefIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidInterfaceDefIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidLabelIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidLabelIndent.java
index 1437e7147..4a35b2840 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidLabelIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidLabelIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidMethodIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidMethodIndent.java
index 19000b37c..1822713d8 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidMethodIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidMethodIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.util.Arrays; //indent:0 exp:0
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidSwitchIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidSwitchIndent.java
index b5cb6fd67..42e7948e9 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidSwitchIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidSwitchIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidTryIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidTryIndent.java
index 46c5e5b0c..68f31e574 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidTryIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidTryIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                            //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:    //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidTryResourcesIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidTryResourcesIndent.java
index e1bed7f46..4874f2e93 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidTryResourcesIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidTryResourcesIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 import java.io.FileInputStream; //indent:0 exp:0
 import java.io.IOException; //indent:0 exp:0
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidWhileIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidWhileIndent.java
index 4c7f18d9d..fe31fb498 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputValidWhileIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputValidWhileIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputZeroCaseLevel.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputZeroCaseLevel.java
index 8117b4637..511b372c5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputZeroCaseLevel.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InputZeroCaseLevel.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InvalidInputThrowsIndent.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InvalidInputThrowsIndent.java
index 2e80f2b19..1daa65db5 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InvalidInputThrowsIndent.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/indentation/InvalidInputThrowsIndent.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.indentation; //indent:0 exp:0
+package com.puppycrawl.tools.checkstyle.checks.indentation; //indent:0 exp:0
 
 /**                                                                           //indent:0 exp:0
  * This test-input is intended to be checked using following configuration:   //indent:1 exp:1
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputPackageDeclaration.java b/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputPackageDeclaration.java
deleted file mode 100644
index bd46be794..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/indentation/InputPackageDeclaration.java
+++ /dev/null
@@ -1,3 +0,0 @@
- package com.puppycrawl.tools.checkstyle.indentation;//indent:1 exp:0 warn
-
-public class InputPackageDeclaration {}//indent:0 exp:0