diff --git a/build.xml b/build.xml
index 846946018..a32f5a9aa 100644
--- a/build.xml
+++ b/build.xml
@@ -42,6 +42,7 @@
     <property name="repository" value="http://www.ibiblio.org/maven"/>
     <property name="forrest.home" value="${env.FORREST_HOME}"/>
 
+    <property name="main.resource1.dir" value="src/resources/fontmetrics"/>
     <property name="main.src" location="src/java"/>
     <property name="main.src.test" location="src/testcases"/>
     <property name="main.documentation" value="src/documentation"/>
diff --git a/src/java/org/apache/poi/ddf/TestEscherBSERecord.java b/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherBSERecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherBlipRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherBlipRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherBoolProperty.java b/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherBoolProperty.java
rename to src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherClientDataRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherClientDataRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherContainerRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherContainerRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherDgRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherDgRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherDggRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherDggRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherOptRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherOptRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherPropertyFactory.java b/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherPropertyFactory.java
rename to src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherSpRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherSpRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherSpgrRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherSpgrRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
rename to src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
diff --git a/src/java/org/apache/poi/ddf/TestUnknownEscherRecord.java b/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java
similarity index 100%
rename from src/java/org/apache/poi/ddf/TestUnknownEscherRecord.java
rename to src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java
diff --git a/src/java/org/apache/poi/hssf/model/TestDrawingManager.java b/src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/model/TestDrawingManager.java
rename to src/testcases/org/apache/poi/hssf/model/TestDrawingManager.java
diff --git a/src/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
rename to src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java b/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
rename to src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/TestEndSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/record/TestEndSubRecord.java
rename to src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/TestEscherAggregate.java b/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/record/TestEscherAggregate.java
rename to src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java
diff --git a/src/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java b/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
rename to src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java