diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocTypeCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java
similarity index 99%
rename from src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocTypeCheck.java
rename to src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java
index 2eb059cac..ec9bd2165 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocTypeCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java
@@ -16,7 +16,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ////////////////////////////////////////////////////////////////////////////////
-package com.puppycrawl.tools.checkstyle.checks;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.regexp.RE;
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/AllTests.java b/src/tests/com/puppycrawl/tools/checkstyle/AllTests.java
index df1c1c42e..ce653f6e7 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/AllTests.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/AllTests.java
@@ -23,7 +23,6 @@ import com.puppycrawl.tools.checkstyle.checks.IllegalInstantiationCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.IndentationCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.InnerAssignmentCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.JavadocMethodCheckTest;
-import com.puppycrawl.tools.checkstyle.checks.JavadocTypeCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.LeftCurlyCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.LineLengthCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.LocalFinalVariableNameCheckTest;
@@ -66,6 +65,7 @@ import com.puppycrawl.tools.checkstyle.checks.FinalParametersCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.HideUtilityClassConstructorCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.AvoidNestedBlocksCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.InterfaceIsTypeCheckTest;
+import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheckTest;
 import junit.framework.Test;
 import junit.framework.TestSuite;
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/JavadocTypeCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java
similarity index 99%
rename from src/tests/com/puppycrawl/tools/checkstyle/checks/JavadocTypeCheckTest.java
rename to src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java
index b12670e16..95542f872 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/checks/JavadocTypeCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheckTest.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks;
+package com.puppycrawl.tools.checkstyle.checks.javadoc;
 
 import com.puppycrawl.tools.checkstyle.BaseCheckTestCase;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;