diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/messages.properties b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/messages.properties
index a15452682..f6872093e 100755
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/messages.properties
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/messages.properties
@@ -28,8 +28,3 @@ unusedVariable=Variable ''{0}'' is never used.
 ncss.method=NCSS for this method is {0,number,integer} (max allowed is {1,number,integer}).
 ncss.class=NCSS for this class is {0,number,integer} (max allowed is {1,number,integer}).
 ncss.file=NCSS for this file is {0,number,integer} (max allowed is {1,number,integer}).
-too.many.privateMethods=Number of private methods is {0,number,integer} (max allowed is {1,number,integer}).
-too.many.packageMethods=Number of package methods is {0,number,integer} (max allowed is {1,number,integer}).
-too.many.protectedMethods=Number of protected methods is {0,number,integer} (max allowed is {1,number,integer}).
-too.many.publicMethods=Number of public methods is {0,number,integer} (max allowed is {1,number,integer}).
-too.many.methods=Total number of methods is {0,number,integer} (max allowed is {1,number,integer}).
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/MethodCountCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java
similarity index 99%
rename from src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/MethodCountCheck.java
rename to src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java
index dc1ba1bc5..01b11e387 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/metrics/MethodCountCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.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.metrics;
+package com.puppycrawl.tools.checkstyle.checks.sizes;
 
 import com.puppycrawl.tools.checkstyle.api.Check;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/messages.properties b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/messages.properties
index 2b0eb021a..c86881fb6 100755
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/messages.properties
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/sizes/messages.properties
@@ -5,3 +5,8 @@ maxLen.anonInner=Anonymous inner class length is {0,number,integer} lines (max a
 maxLineLen=Line is longer than {0,number,integer} characters.
 maxOuterTypes=Outer types defined is {0,number,integer} (max allowed is {1,number,integer}).
 maxParam=More than {0,number,integer} parameters.
+too.many.privateMethods=Number of private methods is {0,number,integer} (max allowed is {1,number,integer}).
+too.many.packageMethods=Number of package methods is {0,number,integer} (max allowed is {1,number,integer}).
+too.many.protectedMethods=Number of protected methods is {0,number,integer} (max allowed is {1,number,integer}).
+too.many.publicMethods=Number of public methods is {0,number,integer} (max allowed is {1,number,integer}).
+too.many.methods=Total number of methods is {0,number,integer} (max allowed is {1,number,integer}).
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/metrics/MethodCountCheckInput.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput.java
similarity index 98%
rename from src/tests/com/puppycrawl/tools/checkstyle/checks/metrics/MethodCountCheckInput.java
rename to src/tests/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput.java
index 6472a4494..200f71068 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/checks/metrics/MethodCountCheckInput.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckInput.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.metrics;
+package com.puppycrawl.tools.checkstyle.checks.sizes;
 
 public class MethodCountCheckInput {
 
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/metrics/MethodCountCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java
similarity index 84%
rename from src/tests/com/puppycrawl/tools/checkstyle/checks/metrics/MethodCountCheckTest.java
rename to src/tests/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java
index 1d4897454..f264c9880 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/checks/metrics/MethodCountCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheckTest.java
@@ -1,10 +1,10 @@
-package com.puppycrawl.tools.checkstyle.checks.metrics;
+package com.puppycrawl.tools.checkstyle.checks.sizes;
 
 import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 import org.junit.Test;
 
-public class MethodCountCheckTest  extends BaseCheckTestSupport {
+public class MethodCountCheckTest extends BaseCheckTestSupport {
 
     @Test
     public void testDefaults() throws Exception
@@ -16,7 +16,7 @@ public class MethodCountCheckTest  extends BaseCheckTestSupport {
         };
 
         verify(checkConfig,
-            getSrcPath("checks/metrics/MethodCountCheckInput.java"), expected);
+            getSrcPath("checks/sizes/MethodCountCheckInput.java"), expected);
     }
 
     @Test
@@ -43,6 +43,6 @@ public class MethodCountCheckTest  extends BaseCheckTestSupport {
         };
 
         verify(checkConfig,
-            getSrcPath("checks/metrics/MethodCountCheckInput.java"), expected);
+            getSrcPath("checks/sizes/MethodCountCheckInput.java"), expected);
     }
 }
\ No newline at end of file