diff --git a/src/scratchpad/src/org/apache/poi/hdf/event/EventBridge.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/event/EventBridge.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/event/EventBridge.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/event/EventBridge.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/event/HDFParsingListener.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/event/HDFParsingListener.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/event/HDFParsingListener.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/event/HDFParsingListener.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/CHP.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/CHP.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/CHP.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/CHP.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/FontTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/FontTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/FontTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/FontTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/HeaderFooter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/HeaderFooter.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/NewOleFile.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/NewOleFile.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/NewOleFile.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/NewOleFile.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/PAP.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/PAP.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/PAP.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/PAP.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/PropertySet.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/PropertySet.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/PropertySet.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/PropertySet.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/SEP.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/SEP.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/SEP.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/SEP.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleDescription.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/StyleDescription.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/StyleDescription.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/StyleDescription.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/StyleSheet.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/StyleSheet.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TAP.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/TAP.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/TAP.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/TAP.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TC.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/TC.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/TC.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/TC.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TableRow.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/TableRow.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/TableRow.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/TableRow.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TextPiece.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/TextPiece.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/TextPiece.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/TextPiece.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/Utils.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/Utils.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/Utils.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/Utils.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/WordDocument.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/WordDocument.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/DOP.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/DOP.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/data/DOP.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/DOP.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFO.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/LFO.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFO.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/LFO.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFOLVL.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/LFOLVL.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFOLVL.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/LFOLVL.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LST.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/LST.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/data/LST.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/LST.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LVL.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/LVL.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/data/LVL.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/LVL.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/ListTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/ListTables.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/data/ListTables.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/data/ListTables.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/BTreeSet.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/BTreeSet.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/ChpxNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/ChpxNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/util/ChpxNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/ChpxNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/NumberFormatter.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/NumberFormatter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/util/NumberFormatter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/NumberFormatter.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PapxNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/PapxNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/util/PapxNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/PapxNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PropertyNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/PropertyNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/util/PropertyNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/PropertyNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/SepxNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/SepxNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/extractor/util/SepxNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/extractor/util/SepxNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/HDFDocument.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/HDFDocument.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/HDFObjectFactory.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/HDFObjectFactory.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/HDFObjectModel.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/HDFObjectModel.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/ChpxNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/ChpxNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/FontTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/FontTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/HDFType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/HDFType.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/LFO.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/LFO.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/LFOLVL.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/LFOLVL.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/LST.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/LST.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/LVL.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/LVL.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/ListTables.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/ListTables.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/PapxNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/PapxNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/PropertyNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/PropertyNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/SectionProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/SectionProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/SepxNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/SepxNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/StyleDescription.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/StyleDescription.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/TableProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/TableProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/TextPiece.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/TextPiece.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/util/BTreeSet.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/util/BTreeSet.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/util/NumberFormatter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/util/NumberFormatter.java
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java b/poi-scratchpad/src/main/java/org/apache/poi/hdf/model/util/ParsingState.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdf/model/util/ParsingState.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFDiagram.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFDiagram.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZWCompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZWCompressor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/HDGFLZWCompressor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZWCompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeader.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeader.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkSeparator.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkSeparator.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkTrailer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkTrailer.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/dev/VSDDumper.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/dev/VSDDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/exceptions/HDGFException.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/exceptions/HDGFException.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/Pointer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/Pointer.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerFactory.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerFactory.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV6.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV6.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/PointerContainingStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/streams/PointerContainingStream.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/Stream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/Stream.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/streams/Stream.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/Stream.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/StreamStore.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/StreamStore.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/streams/StreamStore.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/StreamStore.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/StringsStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/StringsStream.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/streams/StringsStream.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/StringsStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/TrailerStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/TrailerStream.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/streams/TrailerStream.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/TrailerStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/UnknownStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/UnknownStream.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hdgf/streams/UnknownStream.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/UnknownStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/Attachment.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/Attachment.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/Attachment.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/Attachment.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/CompressedRTF.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/CompressedRTF.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/CompressedRTF.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/CompressedRTF.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFAttribute.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/dev/HMEFDumper.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/dev/HMEFDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/HPBFDocument.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/HPBFDocument.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/HPBFDocument.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/HPBFDocument.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/dev/HPBFDumper.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/dev/HPBFDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/dev/PLCDumper.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/dev/PLCDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherDelayStm.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherDelayStm.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/model/EscherDelayStm.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherDelayStm.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherPart.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherPart.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherStm.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherStm.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/model/EscherStm.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherStm.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/MainContents.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/MainContents.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/model/MainContents.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/MainContents.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCBit.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCBit.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/EncryptedSlideShow.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/EncryptedSlideShow.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/EncryptedSlideShow.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/EncryptedSlideShow.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/HSLFSlideShow.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/HSLFSlideShow.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/BitmapPainter.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/BitmapPainter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/blip/BitmapPainter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/BitmapPainter.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/ImagePainter.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/ImagePainter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/blip/ImagePainter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/ImagePainter.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/PPDrawingTextListing.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/PPDrawingTextListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTTextListing.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTTextListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/TextStyleListing.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/TextStyleListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/HSLFException.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/HSLFException.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/exceptions/HSLFException.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/HSLFException.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/InvalidRecordFormatException.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/InvalidRecordFormatException.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/exceptions/InvalidRecordFormatException.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/InvalidRecordFormatException.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/extractor/ImageExtractor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/extractor/ImageExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/extractor/PowerPointExtractor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/extractor/PowerPointExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ActiveXShape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ActiveXShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/AutoShape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/AutoShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/AutoShapes.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/AutoShapes.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/AutoShapes.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/AutoShapes.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Background.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Background.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Background.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Background.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Comment.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Comment.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Comment.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Comment.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Fill.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Fill.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Fill.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Freeform.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Freeform.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Freeform.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Freeform.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HeadersFooters.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HeadersFooters.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Hyperlink.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Hyperlink.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Hyperlink.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Hyperlink.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Line.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Line.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Line.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Line.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/MasterSheet.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/MasterSheet.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/MasterSheet.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/MasterSheet.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/MovieShape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/MovieShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Notes.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Notes.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Notes.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Notes.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/OLEShape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/OLEShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/PPFont.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/PPFont.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/PPFont.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/PPFont.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/PPGraphics2D.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/PPGraphics2D.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Picture.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Picture.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Placeholder.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Placeholder.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Placeholder.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Placeholder.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Polygon.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Polygon.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Shape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Shape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Shape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ShapeFactory.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ShapeFactory.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ShapeGroup.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ShapeGroup.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/ShapeOutline.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ShapeOutline.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/ShapeOutline.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ShapeOutline.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/ShapePainter.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ShapePainter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/ShapePainter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ShapePainter.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/ShapeTypes.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ShapeTypes.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/ShapeTypes.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ShapeTypes.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Sheet.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Sheet.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Sheet.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Sheet.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/SimpleShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/SimpleShape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/SimpleShape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/SimpleShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Slide.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Slide.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Slide.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Slide.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/SlideMaster.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/SlideMaster.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/SlideMaster.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/SlideMaster.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Table.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Table.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/Table.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Table.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/TableCell.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TableCell.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/TableCell.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TableCell.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/TextBox.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TextBox.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/TextBox.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TextBox.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/TextPainter.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TextPainter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/TextPainter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TextPainter.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TextRun.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TextRun.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TextShape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TextShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/TitleMaster.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TitleMaster.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/TitleMaster.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/TitleMaster.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/AlignmentTextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/AlignmentTextProp.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/AlignmentTextProp.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/AlignmentTextProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/IndentProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/IndentProp.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/IndentProp.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/IndentProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPFException9.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPFException9.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextProp.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfo.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfo.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfoAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfoAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/BinaryTagDataBlob.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/BinaryTagDataBlob.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/BinaryTagDataBlob.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/BinaryTagDataBlob.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/CString.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CString.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/CString.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CString.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000Atom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000Atom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Document.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Document.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/Document.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Document.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/DocumentAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DummyRecordWithChildren.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DummyRecordWithChildren.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Environment.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Environment.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/Environment.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Environment.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExAviMovie.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExAviMovie.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExAviMovie.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExAviMovie.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExControl.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExControl.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExControlAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExControlAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbed.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbed.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbedAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbedAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExEmbedAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbedAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlink.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlink.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlinkAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlinkAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlinkAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlinkAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExMCIMovie.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExMCIMovie.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExMediaAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExMediaAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExMediaAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExMediaAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjList.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjList.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjListAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjListAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExObjListAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjListAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExVideoContainer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExVideoContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/FontCollection.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/FontCollection.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/FontEntityAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/FontEntityAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/FontEntityAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/FontEntityAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersContainer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfo.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfo.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfoAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfoAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/MainMaster.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/MainMaster.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Notes.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/Notes.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Notes.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/NotesAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/NotesAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/NotesAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/NotesAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/OEPlaceholderAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/OEPlaceholderAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/OEPlaceholderAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/OEPlaceholderAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/OEShapeAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/OEShapeAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/OEShapeAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/OEShapeAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/OutlineTextRefAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/OutlineTextRefAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/OutlineTextRefAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/OutlineTextRefAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ParentAwareRecord.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ParentAwareRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PersistPtrHolder.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PersistPtrHolder.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PersistRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PersistRecord.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/PersistRecord.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PersistRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecord.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecord.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/Record.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordTypes.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordTypes.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SheetContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SheetContainer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/SheetContainer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SheetContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Slide.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/Slide.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Slide.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlideListWithText.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlideListWithText.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlidePersistAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlidePersistAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/SlidePersistAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlidePersistAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Sound.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/Sound.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Sound.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SoundCollection.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SoundCollection.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/SoundCollection.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SoundCollection.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SoundData.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SoundData.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextProp9Atom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextProp9Atom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextAutoNumberSchemeEnum.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextAutoNumberSchemeEnum.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/TextAutoNumberSchemeEnum.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextAutoNumberSchemeEnum.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextBytesAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextBytesAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/TextBytesAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextBytesAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextCharsAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextCharsAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextHeaderAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextHeaderAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/UserEditAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/UserEditAtom.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/record/UserEditAtom.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/record/UserEditAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/ObjectData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/ObjectData.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/ObjectData.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/ObjectData.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/PictureData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/PictureData.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/PictureData.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/PictureData.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/RichTextRun.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/RichTextRun.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/SlideShow.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/SlideShow.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/SoundData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/SoundData.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/SoundData.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/SoundData.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/util/MutableByteArrayOutputStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/util/MutableByteArrayOutputStream.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/util/MutableByteArrayOutputStream.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/util/MutableByteArrayOutputStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/util/SystemTimeUtils.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hslf/util/SystemTimeUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunk.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunk.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunk.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroup.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroup.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroup.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroup.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/NameIdChunks.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/NameIdChunks.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertyValue.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertyValue.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StringChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StringChunk.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/StringChunk.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StringChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Types.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Types.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/HSMFDump.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/HSMFDump.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/exceptions/DirectoryChunkNotFoundException.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/DirectoryChunkNotFoundException.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/exceptions/DirectoryChunkNotFoundException.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/DirectoryChunkNotFoundException.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelConverter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoUtils.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoUtils.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocumentCore.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocumentCore.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/OldWordFileFormatException.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/OldWordFileFormatException.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/OldWordFileFormatException.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/OldWordFileFormatException.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/QuickTest.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/QuickTest.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/QuickTest.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/QuickTest.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/DefaultFontReplacer.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/FoDocumentFacade.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/FoDocumentFacade.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/FontReplacer.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/FontReplacer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/FontReplacer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/FontReplacer.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/NumberFormatter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/NumberFormatter.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/PicturesManager.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/PicturesManager.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/PicturesManager.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/PicturesManager.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/TextDocumentFacade.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/TextDocumentFacade.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/TextDocumentFacade.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/TextDocumentFacade.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoUtils.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/FieldIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/FieldIterator.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/dev/FieldIterator.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/FieldIterator.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BytePropertyNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BytePropertyNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPX.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPX.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CachedPropertyNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CachedPropertyNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CharIndexTranslator.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CharIndexTranslator.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Colorref.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Colorref.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ComplexFileTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ComplexFileTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/DocumentProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/DocumentProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/EscherRecordHolder.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/EscherRecordHolder.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FFData.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FFData.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FFDataBase.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FFDataBase.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FFDataBase.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FFDataBase.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPA.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPA.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FSPA.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPA.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPADocumentPart.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPADocumentPart.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPATable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPATable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Ffn.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Ffn.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibBase.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibBase.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FibBase.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibBase.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw95.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw95.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw95.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw95.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw97.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw97.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw97.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw97.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgW97.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgW97.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FibRgW97.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgW97.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldDescriptor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsDocumentPart.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsDocumentPart.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsTables.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsTables.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FormattedDiskPage.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FormattedDiskPage.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/GenericPropertyNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/GenericPropertyNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Grfhic.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Grfhic.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/Grfhic.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Grfhic.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/HDFType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/HDFType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/HDFType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/HDFType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Hyphenation.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Hyphenation.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LFO.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFO.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/LFO.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFO.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOData.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOData.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LFOLVLBase.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOLVLBase.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/LFOLVLBase.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOLVLBase.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LSTF.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LSTF.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/LSTF.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LSTF.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LVLF.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LVLF.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/LVLF.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LVLF.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListData.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListData.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NoteType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NoteType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NotesTables.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NotesTables.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldCHPBinTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldCHPBinTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldPAPBinTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldPAPBinTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldSectionTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldSectionTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPX.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPX.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PICF.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICF.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PICF.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICF.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ParagraphHeight.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ParagraphHeight.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PieceDescriptor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PieceDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfCps.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfCps.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfField.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfField.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyModifier.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyModifier.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SEPX.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SEPX.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByEntry.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByEntry.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionDescriptor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ShapesTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ShapesTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SinglentonTextPiece.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SinglentonTextPiece.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/SinglentonTextPiece.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SinglentonTextPiece.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StdfBase.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfBase.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/StdfBase.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfBase.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StdfPost2000.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfPost2000.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/StdfPost2000.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfPost2000.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Stshif.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Stshif.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/Stshif.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Stshif.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SttbUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SttbUtils.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/SttbUtils.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SttbUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SubdocumentType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SubdocumentType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TabDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TabDescriptor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/TabDescriptor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TabDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPiece.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPiece.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/UPX.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/UPX.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/UnhandledDataStructure.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/UnhandledDataStructure.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xst.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xst.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFOutputStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFOutputStream.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFOutputStream.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFOutputStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/BKFAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/BKFAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/CHPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/CHPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/DOPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/DOPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FLDAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FLDAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FRDAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FRDAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PAPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PAPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PICFAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PICFAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SEPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SEPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHD80AbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHDAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHDAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/SHDAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHDAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StshifAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StshifAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/StshifAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StshifAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TAPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TAPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TBDAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TBDAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/TBDAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TBDAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TCAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TCAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TLPAbstractType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TLPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmIterator.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmIterator.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmIterator.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmOperation.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmOperation.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUncompressor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUncompressor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUncompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmark.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmark.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmark.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmark.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmarks.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmarks.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmarks.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmarks.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BorderCode.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BorderCode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterRun.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterRun.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DateAndTime.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DateAndTime.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DocumentPosition.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DocumentPosition.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/DocumentPosition.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DocumentPosition.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Field.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Field.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Field.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Field.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldImpl.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldImpl.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Fields.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Fields.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Fields.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Fields.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldsImpl.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldsImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HeaderStories.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HeaderStories.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ListEntry.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ListEntry.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ListEntry.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ListEntry.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Notes.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Notes.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Notes.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Notes.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/NotesImpl.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/NotesImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectsPool.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectsPool.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectsPool.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectsPool.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawing.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawings.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureType.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Section.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Section.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/SectionProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/SectionProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Shape.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Shape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Shape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Shape.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Table.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Table.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCell.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCell.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCell.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCell.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableIterator.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableIterator.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableIterator.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableProperties.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java
rename to poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoShape.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/AutoShape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/AutoShape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/AutoShape.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Background.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Background.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/Background.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Background.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Fill.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Fill.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/Fill.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Fill.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/FontCollection.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/FontCollection.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/FontCollection.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/FontCollection.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Hyperlink.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Hyperlink.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/Hyperlink.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Hyperlink.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Line.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Line.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/Line.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Line.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/LineStyle.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/LineStyle.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/LineStyle.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/LineStyle.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/MasterSheet.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/MasterSheet.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/MasterSheet.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/MasterSheet.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Notes.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Notes.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/Notes.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Notes.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Picture.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Picture.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/Picture.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Picture.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/PictureData.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/PictureData.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/PictureData.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/PictureData.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Resources.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Resources.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/Resources.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Resources.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Shape.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Shape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/Shape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Shape.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/ShapeContainer.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeContainer.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/ShapeContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeGroup.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/ShapeGroup.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeGroup.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/ShapeGroup.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeTypes.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/ShapeTypes.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeTypes.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/ShapeTypes.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Sheet.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Sheet.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/Sheet.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Sheet.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/SimpleShape.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/SimpleShape.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/SimpleShape.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/SimpleShape.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Slide.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Slide.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/Slide.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/Slide.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/SlideShow.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/SlideShow.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/SlideShow.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/SlideShow.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/TextBox.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/TextBox.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/TextBox.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/TextBox.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/TextRun.java b/poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/TextRun.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/sl/usermodel/TextRun.java
rename to poi-scratchpad/src/main/java/org/apache/poi/sl/usermodel/TextRun.java