diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java
index 3ad213f6b..1e2a41231 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/ClassResolver.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
  * @author <a href="mailto:oliver@puppycrawl.com">Oliver Burn</a>
  * @version 1.0
  */
-class ClassResolver
+public class ClassResolver
 {
     /** name of the package to check if the class belongs to **/
     private final String mPkg;
@@ -45,7 +45,7 @@ class ClassResolver
      * @param aPkg the name of the package the class may belong to
      * @param aImports set of imports to check if the class belongs to
      */
-    ClassResolver(ClassLoader aLoader, String aPkg, Set aImports)
+    public ClassResolver(ClassLoader aLoader, String aPkg, Set aImports)
     {
         mLoader = aLoader;
         mPkg = aPkg;
@@ -63,7 +63,7 @@ class ClassResolver
      * @return the resolved class
      * @throws ClassNotFoundException if unable to resolve the class
      */
-    Class resolve(String aName) throws ClassNotFoundException
+    public Class resolve(String aName) throws ClassNotFoundException
     {
         // See if the class is full qualified
         if (isLoadable(aName)) {
@@ -115,7 +115,7 @@ class ClassResolver
      * @return whether a specified class is loadable with safeLoad().
      * @param aName name of the class to check
      */
-    boolean isLoadable(String aName)
+    public boolean isLoadable(String aName)
     {
         try {
             safeLoad(aName);
@@ -133,7 +133,7 @@ class ClassResolver
      * @return the <code>Class</code> for the specified class
      * @throws ClassNotFoundException if an error occurs
      */
-    Class safeLoad(String aName)
+    public Class safeLoad(String aName)
         throws ClassNotFoundException
     {
         // The next line will load the class using the specified class
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocMethodCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java
similarity index 99%
rename from src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocMethodCheck.java
rename to src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.java
index 010c5899e..87ec3c20c 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocMethodCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheck.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 com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.FileContents;
@@ -25,6 +25,8 @@ import com.puppycrawl.tools.checkstyle.api.Scope;
 import com.puppycrawl.tools.checkstyle.api.ScopeUtils;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
 import com.puppycrawl.tools.checkstyle.api.Utils;
+import com.puppycrawl.tools.checkstyle.checks.AbstractImportCheck;
+import com.puppycrawl.tools.checkstyle.checks.ClassResolver;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocTag.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.java
similarity index 98%
rename from src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocTag.java
rename to src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.java
index 00fa2616e..d53d801ca 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/JavadocTag.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTag.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;
 
 /**
  * Represents a Javadoc tag. Provides methods to query what type of tag it is.
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/PackageHtmlCheck.java
similarity index 98%
rename from src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java
rename to src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/PackageHtmlCheck.java
index fe8e52d56..b15027ef1 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/javadoc/PackageHtmlCheck.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 java.io.File;
 import java.util.Iterator;
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/AllTests.java b/src/tests/com/puppycrawl/tools/checkstyle/AllTests.java
index ce653f6e7..616d838d5 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/AllTests.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/AllTests.java
@@ -22,7 +22,6 @@ import com.puppycrawl.tools.checkstyle.checks.IllegalImportCheckTest;
 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.LeftCurlyCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.LineLengthCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.LocalFinalVariableNameCheckTest;
@@ -38,7 +37,6 @@ import com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.NoWhitespaceAfterCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.NoWhitespaceBeforeCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.OperatorWrapCheckTest;
-import com.puppycrawl.tools.checkstyle.checks.PackageHtmlCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.PackageNameCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.ParameterNameCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.ParameterNumberCheckTest;
@@ -65,8 +63,10 @@ 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.JavadocMethodCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheckTest;
 import com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheckTest;
+import com.puppycrawl.tools.checkstyle.checks.javadoc.PackageHtmlCheckTest;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/JavadocMethodCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java
similarity index 99%
rename from src/tests/com/puppycrawl/tools/checkstyle/checks/JavadocMethodCheckTest.java
rename to src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.java
index 15abb2c6f..def1e2586 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/checks/JavadocMethodCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocMethodCheckTest.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;
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/PackageHtmlCheckTest.java
similarity index 94%
rename from src/tests/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheckTest.java
rename to src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/PackageHtmlCheckTest.java
index d2a3b5e1b..8b6cd757c 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/checks/PackageHtmlCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/javadoc/PackageHtmlCheckTest.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;