diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyCheck.java
index 93d7496e9..f94225187 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyCheck.java
@@ -11,7 +11,6 @@ package com.puppycrawl.tools.checkstyle.checks;
 import com.puppycrawl.tools.checkstyle.api.Check;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.Utils;
-import com.puppycrawl.tools.checkstyle.LeftCurlyOption;
 
 public abstract class LeftCurlyCheck extends Check
 {
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/LeftCurlyOption.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyOption.java
similarity index 91%
rename from src/checkstyle/com/puppycrawl/tools/checkstyle/LeftCurlyOption.java
rename to src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyOption.java
index 28ecbbd46..f2916e2a9 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/LeftCurlyOption.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/LeftCurlyOption.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;
+package com.puppycrawl.tools.checkstyle.checks;
 
 import java.io.Serializable;
 import java.io.ObjectStreamException;
@@ -27,9 +27,10 @@ import java.util.HashMap;
  * Represents the options for placing the left curly brace '{'.
  *
  * @author <a href="mailto:oliver@puppycrawl.com">Oliver Burn</a>
- * @version $Id: LeftCurlyOption.java,v 1.7 2002-10-13 12:46:33 oburn Exp $
+ * @version $Id: LeftCurlyOption.java,v 1.1 2002-10-13 12:53:20 oburn Exp $
  */
-public final class LeftCurlyOption implements Serializable
+public final class LeftCurlyOption
+    implements Serializable
 {
     /** maps from a string representation to an option **/
     private static final Map STR_TO_OPT = new HashMap();
@@ -69,7 +70,7 @@ public final class LeftCurlyOption implements Serializable
         return (LeftCurlyOption) STR_TO_OPT.get(aStrRep.trim().toLowerCase());
     }
 
-    /** @see Object **/
+    /** @see java.lang.Object **/
     public String toString()
     {
         return mStrRep;
@@ -81,7 +82,7 @@ public final class LeftCurlyOption implements Serializable
      * Serialization Specification for details.
      *
      * @return the serialization replacement object
-     * @throws ObjectStreamException if a deserialization error occurs
+     * @throws java.io.ObjectStreamException if a deserialization error occurs
      */
     private Object readResolve() throws ObjectStreamException
     {
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/MethodLeftCurlyCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/MethodLeftCurlyCheckTest.java
index e39530e65..a31dde84a 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/MethodLeftCurlyCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/MethodLeftCurlyCheckTest.java
@@ -1,6 +1,7 @@
 package com.puppycrawl.tools.checkstyle;
 
 import com.puppycrawl.tools.checkstyle.checks.MethodLeftCurlyCheck;
+import com.puppycrawl.tools.checkstyle.checks.LeftCurlyOption;
 
 public class MethodLeftCurlyCheckTest
     extends BaseCheckTestCase
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/OtherLeftCurlyCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/OtherLeftCurlyCheckTest.java
index b7407add1..21ac8d497 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/OtherLeftCurlyCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/OtherLeftCurlyCheckTest.java
@@ -1,6 +1,7 @@
 package com.puppycrawl.tools.checkstyle;
 
 import com.puppycrawl.tools.checkstyle.checks.OtherLeftCurlyCheck;
+import com.puppycrawl.tools.checkstyle.checks.LeftCurlyOption;
 
 public class OtherLeftCurlyCheckTest
     extends BaseCheckTestCase
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/TypeLeftCurlyCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/TypeLeftCurlyCheckTest.java
index 5300f494e..fbea829ad 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/TypeLeftCurlyCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/TypeLeftCurlyCheckTest.java
@@ -1,6 +1,7 @@
 package com.puppycrawl.tools.checkstyle;
 
 import com.puppycrawl.tools.checkstyle.checks.TypeLeftCurlyCheck;
+import com.puppycrawl.tools.checkstyle.checks.LeftCurlyOption;
 
 public class TypeLeftCurlyCheckTest
     extends BaseCheckTestCase