diff --git a/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
similarity index 98%
rename from src/java/org/apache/poi/hssf/record/AreaFormatRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
index ef20677a2..661d2dc27 100644
--- a/src/java/org/apache/poi/hssf/record/AreaFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/AreaRecord.java b/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
similarity index 96%
rename from src/java/org/apache/poi/hssf/record/AreaRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
index 82c3ec249..7d763fa8e 100644
--- a/src/java/org/apache/poi/hssf/record/AreaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
similarity index 95%
rename from src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
index 400bb1c58..737b474e6 100644
--- a/src/java/org/apache/poi/hssf/record/AxisLineFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
similarity index 99%
rename from src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
index 6e7ef699e..0b4f9dd4b 100644
--- a/src/java/org/apache/poi/hssf/record/AxisOptionsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/AxisParentRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
similarity index 97%
rename from src/java/org/apache/poi/hssf/record/AxisParentRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
index e40e9ae00..e0d6d5b58 100644
--- a/src/java/org/apache/poi/hssf/record/AxisParentRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/AxisRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
similarity index 97%
rename from src/java/org/apache/poi/hssf/record/AxisRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
index f12b30b88..4eb92dc51 100644
--- a/src/java/org/apache/poi/hssf/record/AxisRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
similarity index 94%
rename from src/java/org/apache/poi/hssf/record/AxisUsedRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
index 4e860f1b2..b05cf1b9b 100644
--- a/src/java/org/apache/poi/hssf/record/AxisUsedRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/BarRecord.java b/src/java/org/apache/poi/hssf/record/chart/BarRecord.java
similarity index 97%
rename from src/java/org/apache/poi/hssf/record/BarRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/BarRecord.java
index 4f4aa2f69..297a27f12 100644
--- a/src/java/org/apache/poi/hssf/record/BarRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/BarRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/BeginRecord.java b/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
similarity index 92%
rename from src/java/org/apache/poi/hssf/record/BeginRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
index 37d1663ff..85e80f024 100644
--- a/src/java/org/apache/poi/hssf/record/BeginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**
diff --git a/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java b/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
similarity index 98%
rename from src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
index c52e3de3b..0278d5f3d 100644
--- a/src/java/org/apache/poi/hssf/record/CategorySeriesAxisRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
similarity index 96%
rename from src/java/org/apache/poi/hssf/record/ChartFormatRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
index 69a8a8281..de17e4612 100644
--- a/src/java/org/apache/poi/hssf/record/ChartFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndianOutput;
diff --git a/src/java/org/apache/poi/hssf/record/ChartRecord.java b/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
similarity index 96%
rename from src/java/org/apache/poi/hssf/record/ChartRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
index 55ccab640..639a96027 100644
--- a/src/java/org/apache/poi/hssf/record/ChartRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
similarity index 95%
rename from src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
index d24c58a7d..ac9859048 100644
--- a/src/java/org/apache/poi/hssf/record/ChartTitleFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
@@ -18,8 +18,10 @@
 /*
  * HSSF Chart Title Format Record Type
  */
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**
diff --git a/src/java/org/apache/poi/hssf/record/DatRecord.java b/src/java/org/apache/poi/hssf/record/chart/DatRecord.java
similarity index 97%
rename from src/java/org/apache/poi/hssf/record/DatRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/DatRecord.java
index cf4300bba..485fea15d 100644
--- a/src/java/org/apache/poi/hssf/record/DatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/DatRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/DataFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
similarity index 97%
rename from src/java/org/apache/poi/hssf/record/DataFormatRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
index efb2a19d7..bb9d6ad00 100644
--- a/src/java/org/apache/poi/hssf/record/DataFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java b/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
similarity index 96%
rename from src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
index 35ac05e23..4967bd35b 100644
--- a/src/java/org/apache/poi/hssf/record/DefaultDataLabelTextPropertiesRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/EndRecord.java b/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
similarity index 92%
rename from src/java/org/apache/poi/hssf/record/EndRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/EndRecord.java
index 1731a4937..44a5099e2 100644
--- a/src/java/org/apache/poi/hssf/record/EndRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**
diff --git a/src/java/org/apache/poi/hssf/record/FontBasisRecord.java b/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
similarity index 97%
rename from src/java/org/apache/poi/hssf/record/FontBasisRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
index 5825ec824..826a50537 100644
--- a/src/java/org/apache/poi/hssf/record/FontBasisRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/FontIndexRecord.java b/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
similarity index 94%
rename from src/java/org/apache/poi/hssf/record/FontIndexRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
index 1b312b1df..b0047b1f3 100644
--- a/src/java/org/apache/poi/hssf/record/FontIndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/FrameRecord.java b/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
similarity index 97%
rename from src/java/org/apache/poi/hssf/record/FrameRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
index 6e9dcf040..525741422 100644
--- a/src/java/org/apache/poi/hssf/record/FrameRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/LegendRecord.java b/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
similarity index 98%
rename from src/java/org/apache/poi/hssf/record/LegendRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
index a98c16b56..1fd99be97 100644
--- a/src/java/org/apache/poi/hssf/record/LegendRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/LineFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
similarity index 98%
rename from src/java/org/apache/poi/hssf/record/LineFormatRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
index 7e84e0ca5..ed47dabed 100644
--- a/src/java/org/apache/poi/hssf/record/LineFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java b/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
similarity index 98%
rename from src/java/org/apache/poi/hssf/record/LinkedDataRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
index 75b6caab5..114aff596 100644
--- a/src/java/org/apache/poi/hssf/record/LinkedDataRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.hssf.record.formula.Ptg;
 import org.apache.poi.ss.formula.Formula;
 import org.apache.poi.util.BitField;
diff --git a/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java b/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
similarity index 95%
rename from src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
index af8b191d3..fc9f0d777 100644
--- a/src/java/org/apache/poi/hssf/record/NumberFormatIndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java b/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
similarity index 97%
rename from src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
index 0e81c75ec..a94921886 100644
--- a/src/java/org/apache/poi/hssf/record/ObjectLinkRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java b/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
similarity index 93%
rename from src/java/org/apache/poi/hssf/record/PlotAreaRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
index aa382bc4b..47f01fd9b 100644
--- a/src/java/org/apache/poi/hssf/record/PlotAreaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**
diff --git a/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java b/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
similarity index 96%
rename from src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
index 3f460dc35..1ab0ea73d 100644
--- a/src/java/org/apache/poi/hssf/record/PlotGrowthRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
similarity index 95%
rename from src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
index afe0dc3e6..89aaaa5cd 100644
--- a/src/java/org/apache/poi/hssf/record/SeriesChartGroupIndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
similarity index 94%
rename from src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
index c6870b1b6..3204cdda2 100644
--- a/src/java/org/apache/poi/hssf/record/SeriesIndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
similarity index 97%
rename from src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
index 838676886..9fff21af9 100644
--- a/src/java/org/apache/poi/hssf/record/SeriesLabelsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/SeriesListRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
similarity index 95%
rename from src/java/org/apache/poi/hssf/record/SeriesListRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
index c8edda2aa..779ae05af 100644
--- a/src/java/org/apache/poi/hssf/record/SeriesListRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.LittleEndianOutput;
 
 /**
diff --git a/src/java/org/apache/poi/hssf/record/SeriesRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
similarity index 98%
rename from src/java/org/apache/poi/hssf/record/SeriesRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
index 33ca3f9a5..91be5aa9a 100644
--- a/src/java/org/apache/poi/hssf/record/SeriesRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
similarity index 96%
rename from src/java/org/apache/poi/hssf/record/SeriesTextRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
index 8dfaccad3..01a78b51a 100644
--- a/src/java/org/apache/poi/hssf/record/SeriesTextRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
@@ -15,10 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.StringUtil;
 
diff --git a/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesToChartGroupRecord.java
similarity index 95%
rename from src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/SeriesToChartGroupRecord.java
index 1069dad12..164f82c7f 100644
--- a/src/java/org/apache/poi/hssf/record/SeriesToChartGroupRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesToChartGroupRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java b/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
similarity index 98%
rename from src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
index 6d3c7b3ee..7ca006354 100644
--- a/src/java/org/apache/poi/hssf/record/SheetPropertiesRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/TextRecord.java b/src/java/org/apache/poi/hssf/record/chart/TextRecord.java
similarity index 99%
rename from src/java/org/apache/poi/hssf/record/TextRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/TextRecord.java
index 9fc27d4fd..1772d3006 100644
--- a/src/java/org/apache/poi/hssf/record/TextRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/TextRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/TickRecord.java b/src/java/org/apache/poi/hssf/record/chart/TickRecord.java
similarity index 98%
rename from src/java/org/apache/poi/hssf/record/TickRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/TickRecord.java
index 291322499..993f5705c 100644
--- a/src/java/org/apache/poi/hssf/record/TickRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/TickRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/java/org/apache/poi/hssf/record/UnitsRecord.java b/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
similarity index 94%
rename from src/java/org/apache/poi/hssf/record/UnitsRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
index 4ed125381..1ad666229 100644
--- a/src/java/org/apache/poi/hssf/record/UnitsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndianOutput;
 
diff --git a/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java b/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
similarity index 98%
rename from src/java/org/apache/poi/hssf/record/ValueRangeRecord.java
rename to src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
index f1df0dde5..df3aa7c00 100644
--- a/src/java/org/apache/poi/hssf/record/ValueRangeRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
@@ -15,8 +15,10 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.HexDump;
diff --git a/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java b/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
index 10a75b375..8aa849fa2 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
+++ b/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
@@ -21,51 +21,20 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.poi.hssf.record.AreaFormatRecord;
-import org.apache.poi.hssf.record.AxisLineFormatRecord;
-import org.apache.poi.hssf.record.AxisOptionsRecord;
-import org.apache.poi.hssf.record.AxisParentRecord;
-import org.apache.poi.hssf.record.AxisRecord;
-import org.apache.poi.hssf.record.AxisUsedRecord;
+import org.apache.poi.hssf.record.chart.*;
 import org.apache.poi.hssf.record.BOFRecord;
-import org.apache.poi.hssf.record.BarRecord;
-import org.apache.poi.hssf.record.BeginRecord;
-import org.apache.poi.hssf.record.CategorySeriesAxisRecord;
-import org.apache.poi.hssf.record.ChartFormatRecord;
-import org.apache.poi.hssf.record.ChartRecord;
-import org.apache.poi.hssf.record.ChartTitleFormatRecord;
-import org.apache.poi.hssf.record.DataFormatRecord;
-import org.apache.poi.hssf.record.DefaultDataLabelTextPropertiesRecord;
 import org.apache.poi.hssf.record.DimensionsRecord;
 import org.apache.poi.hssf.record.EOFRecord;
-import org.apache.poi.hssf.record.EndRecord;
-import org.apache.poi.hssf.record.FontBasisRecord;
-import org.apache.poi.hssf.record.FontIndexRecord;
 import org.apache.poi.hssf.record.FooterRecord;
-import org.apache.poi.hssf.record.FrameRecord;
 import org.apache.poi.hssf.record.HCenterRecord;
 import org.apache.poi.hssf.record.HeaderRecord;
-import org.apache.poi.hssf.record.LegendRecord;
-import org.apache.poi.hssf.record.LineFormatRecord;
-import org.apache.poi.hssf.record.LinkedDataRecord;
-import org.apache.poi.hssf.record.PlotAreaRecord;
-import org.apache.poi.hssf.record.PlotGrowthRecord;
 import org.apache.poi.hssf.record.PrintSetupRecord;
 import org.apache.poi.hssf.record.ProtectRecord;
 import org.apache.poi.hssf.record.Record;
 import org.apache.poi.hssf.record.RecordBase;
 import org.apache.poi.hssf.record.SCLRecord;
-import org.apache.poi.hssf.record.SeriesIndexRecord;
-import org.apache.poi.hssf.record.SeriesRecord;
-import org.apache.poi.hssf.record.SeriesTextRecord;
-import org.apache.poi.hssf.record.SeriesToChartGroupRecord;
-import org.apache.poi.hssf.record.SheetPropertiesRecord;
-import org.apache.poi.hssf.record.TextRecord;
-import org.apache.poi.hssf.record.TickRecord;
-import org.apache.poi.hssf.record.UnitsRecord;
 import org.apache.poi.hssf.record.UnknownRecord;
 import org.apache.poi.hssf.record.VCenterRecord;
-import org.apache.poi.hssf.record.ValueRangeRecord;
 import org.apache.poi.hssf.record.formula.Area3DPtg;
 import org.apache.poi.hssf.record.formula.Ptg;
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java b/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
index d244d3372..8baac01d3 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
+++ b/src/scratchpad/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
@@ -20,11 +20,14 @@ package org.apache.poi.hssf.usermodel;
 import junit.framework.TestCase;
 
 import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.SeriesRecord;
+import org.apache.poi.hssf.record.chart.SeriesRecord;
 
+/**
+ * Tests for {@link HSSFChart}
+ */
 public final class TestHSSFChart extends TestCase {
 
-	public void testSingleChart() throws Exception {
+	public void testSingleChart() {
 		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithChart.xls");
 		
 		HSSFSheet s1 = wb.getSheetAt(0);
@@ -53,7 +56,7 @@ public final class TestHSSFChart extends TestCase {
 		assertEquals(15040512, charts[0].getChartHeight());
 	}
 
-	public void testTwoCharts() throws Exception {
+	public void testTwoCharts() {
 		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithTwoCharts.xls");
 		
 		HSSFSheet s1 = wb.getSheetAt(0);
@@ -85,7 +88,7 @@ public final class TestHSSFChart extends TestCase {
 		assertEquals(null, charts[0].getChartTitle());
 	}
 	
-	public void testThreeCharts() throws Exception {
+	public void testThreeCharts() {
 		HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("WithThreeCharts.xls");
 		
 		HSSFSheet s1 = wb.getSheetAt(0);
diff --git a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
index edf62a9ad..db6c7ff3f 100755
--- a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
+++ b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
@@ -22,11 +22,12 @@ import junit.framework.TestSuite;
 
 import org.apache.poi.hssf.record.aggregates.AllRecordAggregateTests;
 import org.apache.poi.hssf.record.cf.TestCellRange;
+import org.apache.poi.hssf.record.chart.AllChartRecordTests;
 import org.apache.poi.hssf.record.constant.TestConstantValueParser;
 import org.apache.poi.hssf.record.formula.AllFormulaTests;
 
 /**
- * Collects all tests for package <tt>org.apache.poi.hssf.record</tt>.
+ * Collects all tests for package <tt>org.apache.poi.hssf.record</tt> and sub-packages.
  * 
  * @author Josh Micich
  */
@@ -35,28 +36,15 @@ public final class AllRecordTests {
 	public static Test suite() {
 		TestSuite result = new TestSuite(AllRecordTests.class.getName());
 
+		result.addTest(AllChartRecordTests.suite());
 		result.addTest(AllFormulaTests.suite());
 		result.addTest(AllRecordAggregateTests.suite());
 
-		result.addTestSuite(TestAreaFormatRecord.class);
-		result.addTestSuite(TestAreaRecord.class);
-		result.addTestSuite(TestAxisLineFormatRecord.class);
-		result.addTestSuite(TestAxisOptionsRecord.class);
-		result.addTestSuite(TestAxisParentRecord.class);
-		result.addTestSuite(TestAxisRecord.class);
-		result.addTestSuite(TestAxisUsedRecord.class);
 		result.addTestSuite(TestBOFRecord.class);
-		result.addTestSuite(TestBarRecord.class);
 		result.addTestSuite(TestBoundSheetRecord.class);
-		result.addTestSuite(TestCategorySeriesAxisRecord.class);
 		result.addTestSuite(TestCFHeaderRecord.class);
 		result.addTestSuite(TestCFRuleRecord.class);
-		result.addTestSuite(TestChartRecord.class);
-		result.addTestSuite(TestChartTitleFormatRecord.class);
 		result.addTestSuite(TestCommonObjectDataSubRecord.class);
-		result.addTestSuite(TestDatRecord.class);
-		result.addTestSuite(TestDataFormatRecord.class);
-		result.addTestSuite(TestDefaultDataLabelTextPropertiesRecord.class);
 		result.addTestSuite(TestDrawingGroupRecord.class);
 		result.addTestSuite(TestEmbeddedObjectRefSubRecord.class);
 		result.addTestSuite(TestEndSubRecord.class);
@@ -64,40 +52,22 @@ public final class AllRecordTests {
 		result.addTestSuite(TestExtendedFormatRecord.class);
 		result.addTestSuite(TestExternalNameRecord.class);
 		result.addTestSuite(TestFontRecord.class);
-		result.addTestSuite(TestFontBasisRecord.class);
-		result.addTestSuite(TestFontIndexRecord.class);
 		result.addTestSuite(TestFormulaRecord.class);
-		result.addTestSuite(TestFrameRecord.class);
 		result.addTestSuite(TestHyperlinkRecord.class);
 		result.addTestSuite(TestLabelRecord.class);
-		result.addTestSuite(TestLegendRecord.class);
-		result.addTestSuite(TestLineFormatRecord.class);
-		result.addTestSuite(TestLinkedDataRecord.class);
 		result.addTestSuite(TestMergeCellsRecord.class);
 		result.addTestSuite(TestNameRecord.class);
 		result.addTestSuite(TestNoteRecord.class);
 		result.addTestSuite(TestNoteStructureSubRecord.class);
-		result.addTestSuite(TestNumberFormatIndexRecord.class);
 		result.addTestSuite(TestObjRecord.class);
-		result.addTestSuite(TestObjectLinkRecord.class);
 		result.addTestSuite(TestPaletteRecord.class);
 		result.addTestSuite(TestPaneRecord.class);
-		result.addTestSuite(TestPlotAreaRecord.class);
-		result.addTestSuite(TestPlotGrowthRecord.class);
 		result.addTestSuite(TestRecordInputStream.class);
 		result.addTestSuite(TestRecordFactory.class);
 		result.addTestSuite(TestSCLRecord.class);
 		result.addTestSuite(TestSSTDeserializer.class);
 		result.addTestSuite(TestSSTRecord.class);
 		result.addTestSuite(TestSSTRecordSizeCalculator.class);
-		result.addTestSuite(TestSeriesChartGroupIndexRecord.class);
-		result.addTestSuite(TestSeriesIndexRecord.class);
-		result.addTestSuite(TestSeriesLabelsRecord.class);
-		result.addTestSuite(TestSeriesListRecord.class);
-		result.addTestSuite(TestSeriesRecord.class);
-		result.addTestSuite(TestSeriesTextRecord.class);
-		result.addTestSuite(TestSeriesToChartGroupRecord.class);
-		result.addTestSuite(TestSheetPropertiesRecord.class);
 		result.addTestSuite(TestSharedFormulaRecord.class);
 		result.addTestSuite(TestStringRecord.class);
 		result.addTestSuite(TestStyleRecord.class);
@@ -106,12 +76,8 @@ public final class AllRecordTests {
 		result.addTestSuite(TestTableRecord.class);
 		result.addTestSuite(TestTextObjectBaseRecord.class);
 		result.addTestSuite(TestTextObjectRecord.class);
-		result.addTestSuite(TestTextRecord.class);
-		result.addTestSuite(TestTickRecord.class);
 		result.addTestSuite(TestUnicodeNameRecord.class);
 		result.addTestSuite(TestUnicodeString.class);
-		result.addTestSuite(TestUnitsRecord.class);
-		result.addTestSuite(TestValueRangeRecord.class);
 		result.addTestSuite(TestCellRange.class);
 		result.addTestSuite(TestConstantValueParser.class);
 		return result;
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java b/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
new file mode 100644
index 000000000..1714e91c0
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
@@ -0,0 +1,71 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record.chart;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Collects all tests for package <tt>org.apache.poi.hssf.record.class</tt>.
+ * 
+ * @author Josh Micich
+ */
+public final class AllChartRecordTests {
+	
+	public static Test suite() {
+		TestSuite result = new TestSuite(AllChartRecordTests.class.getName());
+
+		result.addTestSuite(TestAreaFormatRecord.class);
+		result.addTestSuite(TestAreaRecord.class);
+		result.addTestSuite(TestAxisLineFormatRecord.class);
+		result.addTestSuite(TestAxisOptionsRecord.class);
+		result.addTestSuite(TestAxisParentRecord.class);
+		result.addTestSuite(TestAxisRecord.class);
+		result.addTestSuite(TestAxisUsedRecord.class);
+		result.addTestSuite(TestBarRecord.class);
+		result.addTestSuite(TestCategorySeriesAxisRecord.class);
+		result.addTestSuite(TestChartRecord.class);
+		result.addTestSuite(TestChartTitleFormatRecord.class);
+		result.addTestSuite(TestDatRecord.class);
+		result.addTestSuite(TestDataFormatRecord.class);
+		result.addTestSuite(TestDefaultDataLabelTextPropertiesRecord.class);
+		result.addTestSuite(TestFontBasisRecord.class);
+		result.addTestSuite(TestFontIndexRecord.class);
+		result.addTestSuite(TestFrameRecord.class);
+		result.addTestSuite(TestLegendRecord.class);
+		result.addTestSuite(TestLineFormatRecord.class);
+		result.addTestSuite(TestLinkedDataRecord.class);
+		result.addTestSuite(TestNumberFormatIndexRecord.class);
+		result.addTestSuite(TestObjectLinkRecord.class);
+		result.addTestSuite(TestPlotAreaRecord.class);
+		result.addTestSuite(TestPlotGrowthRecord.class);
+		result.addTestSuite(TestSeriesChartGroupIndexRecord.class);
+		result.addTestSuite(TestSeriesIndexRecord.class);
+		result.addTestSuite(TestSeriesLabelsRecord.class);
+		result.addTestSuite(TestSeriesListRecord.class);
+		result.addTestSuite(TestSeriesRecord.class);
+		result.addTestSuite(TestSeriesTextRecord.class);
+		result.addTestSuite(TestSeriesToChartGroupRecord.class);
+		result.addTestSuite(TestSheetPropertiesRecord.class);
+		result.addTestSuite(TestTextRecord.class);
+		result.addTestSuite(TestTickRecord.class);
+		result.addTestSuite(TestUnitsRecord.class);
+		result.addTestSuite(TestValueRangeRecord.class);
+		return result;
+	}
+}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAreaFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestAreaFormatRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
index fb852ba88..c47a8b4f7 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAreaFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAreaRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestAreaRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
index f514feccb..2570d2e1c 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAreaRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAxisLineFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestAxisLineFormatRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
index 4e9e29a6f..ae80fe2b3 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAxisLineFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAxisOptionsRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
similarity index 97%
rename from src/testcases/org/apache/poi/hssf/record/TestAxisOptionsRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
index de51b48b0..00af6db23 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAxisOptionsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAxisParentRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestAxisParentRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
index 406b68fd6..323f7f3c0 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAxisParentRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAxisRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestAxisRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
index 21e41773c..e8ebf322f 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAxisRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAxisUsedRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
similarity index 94%
rename from src/testcases/org/apache/poi/hssf/record/TestAxisUsedRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
index 5f02d2874..f421b4ffc 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAxisUsedRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBarRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestBarRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
index 80c729c21..4781fe941 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestBarRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCategorySeriesAxisRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestCategorySeriesAxisRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
index 080918aa0..948241dbb 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestCategorySeriesAxisRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestChartRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestChartRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
index 994b15b32..c423d1b9a 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestChartRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestChartTitleFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
similarity index 97%
rename from src/testcases/org/apache/poi/hssf/record/TestChartTitleFormatRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
index 5e285021b..c31a3968c 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestChartTitleFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -27,6 +27,7 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
 import org.apache.poi.hssf.eventusermodel.HSSFListener;
 import org.apache.poi.hssf.eventusermodel.HSSFRequest;
+import org.apache.poi.hssf.record.Record;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestDatRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
index 408d80e56..93b25ed95 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDataFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestDataFormatRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
index 953f13ec0..c9958f507 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDataFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDefaultDataLabelTextPropertiesRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestDefaultDataLabelTextPropertiesRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
index 8557359e8..32bddd81a 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDefaultDataLabelTextPropertiesRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFontBasisRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestFontBasisRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
index 65c19f091..c783a34e6 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFontBasisRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
         
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFontIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
similarity index 94%
rename from src/testcases/org/apache/poi/hssf/record/TestFontIndexRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
index c962e0dae..fb09d30dc 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFontIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFrameRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestFrameRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
index 23f1593ef..da2a8a318 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFrameRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLegendRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestLegendRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
index 6bae58f2a..a23d6741b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLegendRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
@@ -15,7 +15,9 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
+
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
 
 import junit.framework.TestCase;
 
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLineFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestLineFormatRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
index f3b4c3d32..5b58b2256 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLineFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLinkedDataRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
similarity index 98%
rename from src/testcases/org/apache/poi/hssf/record/TestLinkedDataRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
index 6f6e8cc13..d9f09eab7 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLinkedDataRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
@@ -15,11 +15,12 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
 import junit.framework.TestCase;
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
 import org.apache.poi.hssf.record.formula.Area3DPtg;
 import org.apache.poi.hssf.record.formula.Ptg;
 
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNumberFormatIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
similarity index 94%
rename from src/testcases/org/apache/poi/hssf/record/TestNumberFormatIndexRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
index 570d71ec6..d06f646c5 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNumberFormatIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestObjectLinkRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestObjectLinkRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
index 9d8168d4b..f12babe13 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestObjectLinkRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPlotAreaRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
similarity index 94%
rename from src/testcases/org/apache/poi/hssf/record/TestPlotAreaRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
index 631d6895d..bfd678b30 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPlotAreaRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPlotGrowthRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestPlotGrowthRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
index c5896d2b3..cb7de70b0 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPlotGrowthRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesChartGroupIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestSeriesChartGroupIndexRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
index cd09e061e..d216cc2f2 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesChartGroupIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
similarity index 94%
rename from src/testcases/org/apache/poi/hssf/record/TestSeriesIndexRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
index 9ba9b0ad9..86f24a38b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesLabelsRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestSeriesLabelsRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
index c1602dd2a..9f0f1f1ea 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesLabelsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesListRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestSeriesListRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
index 1669dc4df..c049de4f3 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesListRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestSeriesRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
index 2e7cfa6fe..dacaae10d 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesTextRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
similarity index 94%
rename from src/testcases/org/apache/poi/hssf/record/TestSeriesTextRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
index 8b05dc433..2d11999be 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesTextRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
@@ -15,11 +15,14 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import org.apache.poi.hssf.record.RecordFormatException;
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
 import org.apache.poi.util.HexRead;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesToChartGroupRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
similarity index 95%
rename from src/testcases/org/apache/poi/hssf/record/TestSeriesToChartGroupRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
index 8112c54b7..22ad685c2 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesToChartGroupRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSheetPropertiesRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
similarity index 96%
rename from src/testcases/org/apache/poi/hssf/record/TestSheetPropertiesRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
index aa870a337..51794029e 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSheetPropertiesRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTextRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
similarity index 98%
rename from src/testcases/org/apache/poi/hssf/record/TestTextRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
index 8d416050f..4214b0a37 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestTextRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTickRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
similarity index 97%
rename from src/testcases/org/apache/poi/hssf/record/TestTickRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
index b0b8ced7b..0301e7e81 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestTickRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestUnitsRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
similarity index 94%
rename from src/testcases/org/apache/poi/hssf/record/TestUnitsRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
index 7b79553df..4c142bdb0 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestUnitsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestValueRangeRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
similarity index 97%
rename from src/testcases/org/apache/poi/hssf/record/TestValueRangeRecord.java
rename to src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
index 62d7d34c2..d2a08df4a 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestValueRangeRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**