13 files changed, 14 insertions, 16 deletions
diff --git a/build.xml b/build.xml
index 8eb6d18c3..a6a6ca6e3 100644
--- a/build.xml
+++ b/build.xml
@@ -792,8 +792,6 @@ list of possible build targets.
       <group title="Layout">
         <package name="org.apache.fop.layoutmgr"/>
         <package name="org.apache.fop.layoutmgr.*"/>
-        <package name="org.apache.fop.layout"/>
-        <package name="org.apache.fop.layout.*"/>
       </group>
       <group title="Area Tree">
         <package name="org.apache.fop.area"/>
diff --git a/src/java/org/apache/fop/layout/hyphenation/ByteVector.java b/src/java/org/apache/fop/hyphenation/ByteVector.java
index b25d2d9a7..f3c232dc6 100644
--- a/src/java/org/apache/fop/layout/hyphenation/ByteVector.java
+++ b/src/java/org/apache/fop/hyphenation/ByteVector.java
@@ -16,7 +16,7 @@
 
 /* $Id$ */
  
-package org.apache.fop.layout.hyphenation;
+package org.apache.fop.hyphenation;
 
 import java.io.Serializable;
 
diff --git a/src/java/org/apache/fop/layout/hyphenation/CharVector.java b/src/java/org/apache/fop/hyphenation/CharVector.java
index 181191edb..bc4109920 100644
--- a/src/java/org/apache/fop/layout/hyphenation/CharVector.java
+++ b/src/java/org/apache/fop/hyphenation/CharVector.java
@@ -16,7 +16,7 @@
 
 /* $Id$ */
  
-package org.apache.fop.layout.hyphenation;
+package org.apache.fop.hyphenation;
 
 import java.io.Serializable;
 
diff --git a/src/java/org/apache/fop/layout/hyphenation/Hyphen.java b/src/java/org/apache/fop/hyphenation/Hyphen.java
index cbf506ade..84474c98b 100644
--- a/src/java/org/apache/fop/layout/hyphenation/Hyphen.java
+++ b/src/java/org/apache/fop/hyphenation/Hyphen.java
@@ -16,7 +16,7 @@
 
 /* $Id$ */
  
-package org.apache.fop.layout.hyphenation;
+package org.apache.fop.hyphenation;
 
 import java.io.Serializable;
 
diff --git a/src/java/org/apache/fop/layout/hyphenation/Hyphenation.java b/src/java/org/apache/fop/hyphenation/Hyphenation.java
index 4183ceef0..7a922cbdf 100644
--- a/src/java/org/apache/fop/layout/hyphenation/Hyphenation.java
+++ b/src/java/org/apache/fop/hyphenation/Hyphenation.java
@@ -16,7 +16,7 @@
 
 /* $Id$ */
  
-package org.apache.fop.layout.hyphenation;
+package org.apache.fop.hyphenation;
 
 /**
  * This class represents a hyphenated word.
diff --git a/src/java/org/apache/fop/layout/hyphenation/HyphenationException.java b/src/java/org/apache/fop/hyphenation/HyphenationException.java
index 9276fe5fa..d66ce985d 100644
--- a/src/java/org/apache/fop/layout/hyphenation/HyphenationException.java
+++ b/src/java/org/apache/fop/hyphenation/HyphenationException.java
@@ -16,7 +16,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.layout.hyphenation;
+package org.apache.fop.hyphenation;
 
 /**
  * @author Carlos Villegas <cav@uniscope.co.jp>
diff --git a/src/java/org/apache/fop/layout/hyphenation/HyphenationTree.java b/src/java/org/apache/fop/hyphenation/HyphenationTree.java
index 0a39e84b5..51a1a875e 100644
--- a/src/java/org/apache/fop/layout/hyphenation/HyphenationTree.java
+++ b/src/java/org/apache/fop/hyphenation/HyphenationTree.java
@@ -16,7 +16,7 @@
 
 /* $Id$ */
  
-package org.apache.fop.layout.hyphenation;
+package org.apache.fop.hyphenation;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
diff --git a/src/java/org/apache/fop/layout/hyphenation/Hyphenator.java b/src/java/org/apache/fop/hyphenation/Hyphenator.java
index f6545680d..1e8c52e66 100644
--- a/src/java/org/apache/fop/layout/hyphenation/Hyphenator.java
+++ b/src/java/org/apache/fop/hyphenation/Hyphenator.java
@@ -16,7 +16,7 @@
 
 /* $Id$ */
  
-package org.apache.fop.layout.hyphenation;
+package org.apache.fop.hyphenation;
 
 import java.io.BufferedInputStream;
 import java.io.File;
diff --git a/src/java/org/apache/fop/layout/hyphenation/PatternConsumer.java b/src/java/org/apache/fop/hyphenation/PatternConsumer.java
index 7db7fff71..4f63de381 100644
--- a/src/java/org/apache/fop/layout/hyphenation/PatternConsumer.java
+++ b/src/java/org/apache/fop/hyphenation/PatternConsumer.java
@@ -16,7 +16,7 @@
 
 /* $Id$ */
  
-package org.apache.fop.layout.hyphenation;
+package org.apache.fop.hyphenation;
 
 import java.util.ArrayList;
 
diff --git a/src/java/org/apache/fop/layout/hyphenation/PatternParser.java b/src/java/org/apache/fop/hyphenation/PatternParser.java
index ec047d971..bde436f82 100644
--- a/src/java/org/apache/fop/layout/hyphenation/PatternParser.java
+++ b/src/java/org/apache/fop/hyphenation/PatternParser.java
@@ -16,7 +16,7 @@
 
 /* $Id$ */
  
-package org.apache.fop.layout.hyphenation;
+package org.apache.fop.hyphenation;
 
 // SAX
 import org.xml.sax.XMLReader;
diff --git a/src/java/org/apache/fop/layout/hyphenation/TernaryTree.java b/src/java/org/apache/fop/hyphenation/TernaryTree.java
index 62c95bfb6..d026dc858 100644
--- a/src/java/org/apache/fop/layout/hyphenation/TernaryTree.java
+++ b/src/java/org/apache/fop/hyphenation/TernaryTree.java
@@ -16,7 +16,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.layout.hyphenation;
+package org.apache.fop.hyphenation;
 
 import java.util.Enumeration;
 import java.util.Stack;
diff --git a/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
index 2a097ecec..29acbe4b5 100644
--- a/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
@@ -24,8 +24,8 @@ import org.apache.fop.fo.PropertyManager;
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.CommonMarginBlock;
 import org.apache.fop.fo.properties.CommonHyphenation;
-import org.apache.fop.layout.hyphenation.Hyphenation;
-import org.apache.fop.layout.hyphenation.Hyphenator;
+import org.apache.fop.hyphenation.Hyphenation;
+import org.apache.fop.hyphenation.Hyphenator;
 import org.apache.fop.traits.BlockProps;
 import org.apache.fop.area.LineArea;
 import org.apache.fop.area.Resolveable;
diff --git a/src/java/org/apache/fop/tools/anttasks/SerializeHyphPattern.java b/src/java/org/apache/fop/tools/anttasks/SerializeHyphPattern.java
index b218c6240..8c55da558 100644
--- a/src/java/org/apache/fop/tools/anttasks/SerializeHyphPattern.java
+++ b/src/java/org/apache/fop/tools/anttasks/SerializeHyphPattern.java
@@ -28,8 +28,8 @@ import org.apache.tools.ant.taskdefs.MatchingTask;
 import org.apache.tools.ant.DirectoryScanner;
 
 // FOP
-import org.apache.fop.layout.hyphenation.HyphenationTree;
-import org.apache.fop.layout.hyphenation.HyphenationException;
+import org.apache.fop.hyphenation.HyphenationTree;
+import org.apache.fop.hyphenation.HyphenationException;
 
 /**
  * SerializeHyphPattern