diff --git a/src/java/org/apache/commons/lang/util/BitField.java b/src/java/org/apache/commons/lang/BitField.java
similarity index 99%
rename from src/java/org/apache/commons/lang/util/BitField.java
rename to src/java/org/apache/commons/lang/BitField.java
index 507f19420..911c9728b 100644
--- a/src/java/org/apache/commons/lang/util/BitField.java
+++ b/src/java/org/apache/commons/lang/BitField.java
@@ -51,7 +51,7 @@
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
-package org.apache.commons.lang.util;
+package org.apache.commons.lang;
 
 /**
  * <p>Manage operations dealing with bit-mapped fields.</p>
@@ -63,7 +63,7 @@ package org.apache.commons.lang.util;
  * @author Stephen Colebourne
  * @author Pete Gieser
  * @since 2.0
- * @version $Id: BitField.java,v 1.8 2003/08/18 02:22:25 bayard Exp $
+ * @version $Id: BitField.java,v 1.1 2003/08/19 02:32:15 bayard Exp $
  */
 public class BitField {
     
diff --git a/src/java/org/apache/commons/lang/util/Validate.java b/src/java/org/apache/commons/lang/Validate.java
similarity index 99%
rename from src/java/org/apache/commons/lang/util/Validate.java
rename to src/java/org/apache/commons/lang/Validate.java
index f05657ba1..8941c34d3 100644
--- a/src/java/org/apache/commons/lang/util/Validate.java
+++ b/src/java/org/apache/commons/lang/Validate.java
@@ -51,7 +51,7 @@
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
-package org.apache.commons.lang.util;
+package org.apache.commons.lang;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -70,7 +70,7 @@ import java.util.Map;
  * @author <a href="mailto:ola.berg@arkitema.se">Ola Berg</a>
  * @author Stephen Colebourne
  * @since 2.0
- * @version $Id: Validate.java,v 1.4 2003/08/18 02:22:25 bayard Exp $
+ * @version $Id: Validate.java,v 1.4 2003/08/19 02:32:15 bayard Exp $
  */
 public class Validate {
     
diff --git a/src/java/org/apache/commons/lang/util/package.html b/src/java/org/apache/commons/lang/util/package.html
index 1a2e8340f..6316ea21b 100644
--- a/src/java/org/apache/commons/lang/util/package.html
+++ b/src/java/org/apache/commons/lang/util/package.html
@@ -5,9 +5,7 @@ Provides classes and methods that provide general utility code.
 <p>
 This includes:
 <ul>
-<li><code>BitField</code> - for manipulating bits
 <li><code>IdentifierUtils</code> - for creating identifiers
-<li><code>Validate</code> - for validating values and throwing exceptions
 </ul>
 @since 2.0
 </body>
diff --git a/src/test/org/apache/commons/lang/util/BitFieldTest.java b/src/test/org/apache/commons/lang/BitFieldTest.java
similarity index 97%
rename from src/test/org/apache/commons/lang/util/BitFieldTest.java
rename to src/test/org/apache/commons/lang/BitFieldTest.java
index ac0349306..3d0b6d769 100644
--- a/src/test/org/apache/commons/lang/util/BitFieldTest.java
+++ b/src/test/org/apache/commons/lang/BitFieldTest.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//lang/src/test/org/apache/commons/lang/util/Attic/BitFieldTest.java,v 1.2 2003/08/18 02:22:28 bayard Exp $
- * $Revision: 1.2 $
- * $Date: 2003/08/18 02:22:28 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//lang/src/test/org/apache/commons/lang/BitFieldTest.java,v 1.1 2003/08/19 02:32:16 bayard Exp $
+ * $Revision: 1.1 $
+ * $Date: 2003/08/19 02:32:16 $
  *
  * ====================================================================
  *
@@ -59,7 +59,7 @@
  *
  */
 
-package org.apache.commons.lang.util;
+package org.apache.commons.lang;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
@@ -72,7 +72,7 @@ import junit.textui.TestRunner;
  * @author Scott Sanders (sanders at apache dot org)
  * @author Marc Johnson
  * @author Glen Stampoultzis (gstamp@iprimus.com.au)
- * @version $Id: BitFieldTest.java,v 1.2 2003/08/18 02:22:28 bayard Exp $
+ * @version $Id: BitFieldTest.java,v 1.1 2003/08/19 02:32:16 bayard Exp $
  */
 
 public class BitFieldTest
diff --git a/src/test/org/apache/commons/lang/LangTestSuite.java b/src/test/org/apache/commons/lang/LangTestSuite.java
index 1ccb6c33b..e60c82f09 100644
--- a/src/test/org/apache/commons/lang/LangTestSuite.java
+++ b/src/test/org/apache/commons/lang/LangTestSuite.java
@@ -64,7 +64,7 @@ import junit.textui.TestRunner;
  * @author Stephen Colebourne
  * @author <a href="mailto:ridesmet@users.sourceforge.net">Ringo De Smet</a>
  * @author Matthew Hawthorne
- * @version $Id: LangTestSuite.java,v 1.22 2003/08/18 02:22:25 bayard Exp $
+ * @version $Id: LangTestSuite.java,v 1.23 2003/08/19 02:32:16 bayard Exp $
  */
 public class LangTestSuite extends TestCase {
     
@@ -89,6 +89,7 @@ public class LangTestSuite extends TestCase {
         TestSuite suite = new TestSuite();
         suite.setName("Commons-Lang Tests");
         suite.addTest(ArrayUtilsTest.suite());
+        suite.addTest(BitFieldTest.suite());
         suite.addTest(BooleanUtilsTest.suite());
         suite.addTest(CharRangeTest.suite());
         suite.addTest(CharSetTest.suite());
@@ -112,6 +113,7 @@ public class LangTestSuite extends TestCase {
         suite.addTest(StringEscapeUtilsTest.suite());
         suite.addTest(SystemUtilsTest.suite());
         suite.addTest(UnhandledExceptionTest.suite());
+        suite.addTest(ValidateTest.suite());
         suite.addTest(WordUtilsTest.suite());
         return suite;
     }
diff --git a/src/test/org/apache/commons/lang/util/ValidateTest.java b/src/test/org/apache/commons/lang/ValidateTest.java
similarity index 99%
rename from src/test/org/apache/commons/lang/util/ValidateTest.java
rename to src/test/org/apache/commons/lang/ValidateTest.java
index 79b73bfdd..091ecde09 100644
--- a/src/test/org/apache/commons/lang/util/ValidateTest.java
+++ b/src/test/org/apache/commons/lang/ValidateTest.java
@@ -51,7 +51,7 @@
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
-package org.apache.commons.lang.util;
+package org.apache.commons.lang;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -67,7 +67,7 @@ import junit.textui.TestRunner;
  * Unit tests {@link org.apache.commons.lang.util.Validate}.
  *
  * @author Stephen Colebourne
- * @version $Id: ValidateTest.java,v 1.3 2003/08/18 02:22:28 bayard Exp $
+ * @version $Id: ValidateTest.java,v 1.3 2003/08/19 02:32:16 bayard Exp $
  */
 public class ValidateTest extends TestCase {
 
diff --git a/src/test/org/apache/commons/lang/util/UtilTestSuite.java b/src/test/org/apache/commons/lang/util/UtilTestSuite.java
index 488bf71d1..db34c76a6 100644
--- a/src/test/org/apache/commons/lang/util/UtilTestSuite.java
+++ b/src/test/org/apache/commons/lang/util/UtilTestSuite.java
@@ -62,7 +62,7 @@ import junit.textui.TestRunner;
  *
  * @author <a href="mailto:bayard@apache.org">Henri Yandell</a>
  * @author Stephen Colebourne
- * @version $Id: UtilTestSuite.java,v 1.4 2003/08/18 02:22:28 bayard Exp $
+ * @version $Id: UtilTestSuite.java,v 1.5 2003/08/19 02:32:16 bayard Exp $
  */
 public class UtilTestSuite extends TestCase {
     
@@ -86,9 +86,7 @@ public class UtilTestSuite extends TestCase {
     public static Test suite() {
         TestSuite suite = new TestSuite();
         suite.setName("Commons-Lang-Util Tests");
-        suite.addTest(BitFieldTest.suite());
         suite.addTest(IdentifierUtilsTest.suite());
-        suite.addTest(ValidateTest.suite());
         return suite;
     }
 }