diff --git a/build.xml b/build.xml
index 7042518d2..db8c88ea8 100644
--- a/build.xml
+++ b/build.xml
@@ -111,10 +111,7 @@ under the License.
   <property name="examples.src" location="src/examples/src"/>
   <property name="examples.output.dir" location="build/examples-classes"/>
 
-  <!-- Common interfaces for ole2 and ooxml classes -->
-  <property name="interfaces.jdk15.src" location="src/ooxml/interfaces-jdk15"/>
-
-  <!-- Experimental OOXML support: -->
+  <!-- OOXML support: -->
   <property name="ooxml.src" location="src/ooxml/java"/>
   <property name="ooxml.src.test" location="src/ooxml/testcases"/>
   <property name="ooxml.reports.test" location="build/ooxml-test-results"/>
@@ -437,7 +434,6 @@ under the License.
     <javac target="${jdk.version.class}" source="${jdk.version.source}"
       failonerror="true" destdir="${main.output.dir}" debug="on" fork="yes">
       <src path="${main.src}" />
-      <src path="${interfaces.jdk15.src}" />
       <classpath refid="main.classpath"/>
     </javac>
     <javac target="${jdk.version.class}" source="${jdk.version.source}"
@@ -978,9 +974,6 @@ FORREST_HOME environment variable!</echo>
       <packageset dir="${ooxml.src}" defaultexcludes="yes">
         <include name="org/apache/poi/**"/>
       </packageset>
-      <packageset dir="${interfaces.jdk15.src}" defaultexcludes="yes">
-        <include name="org/apache/poi/**"/>
-      </packageset>
 
       <classpath id="javadoc.classpath">
         <path refid="main.classpath"/>
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/common/usermodel/Fill.java b/src/java/org/apache/poi/common/usermodel/Fill.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/common/usermodel/Fill.java
rename to src/java/org/apache/poi/common/usermodel/Fill.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/common/usermodel/Hyperlink.java b/src/java/org/apache/poi/common/usermodel/Hyperlink.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/common/usermodel/Hyperlink.java
rename to src/java/org/apache/poi/common/usermodel/Hyperlink.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/common/usermodel/LineStyle.java b/src/java/org/apache/poi/common/usermodel/LineStyle.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/common/usermodel/LineStyle.java
rename to src/java/org/apache/poi/common/usermodel/LineStyle.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/extractor/ExcelExtractor.java b/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/extractor/ExcelExtractor.java
rename to src/java/org/apache/poi/ss/extractor/ExcelExtractor.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/BorderStyle.java b/src/java/org/apache/poi/ss/usermodel/BorderStyle.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/BorderStyle.java
rename to src/java/org/apache/poi/ss/usermodel/BorderStyle.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Cell.java b/src/java/org/apache/poi/ss/usermodel/Cell.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Cell.java
rename to src/java/org/apache/poi/ss/usermodel/Cell.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/CellStyle.java b/src/java/org/apache/poi/ss/usermodel/CellStyle.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/CellStyle.java
rename to src/java/org/apache/poi/ss/usermodel/CellStyle.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/ClientAnchor.java b/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/ClientAnchor.java
rename to src/java/org/apache/poi/ss/usermodel/ClientAnchor.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Comment.java b/src/java/org/apache/poi/ss/usermodel/Comment.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Comment.java
rename to src/java/org/apache/poi/ss/usermodel/Comment.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/CreationHelper.java b/src/java/org/apache/poi/ss/usermodel/CreationHelper.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/CreationHelper.java
rename to src/java/org/apache/poi/ss/usermodel/CreationHelper.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/DataFormat.java b/src/java/org/apache/poi/ss/usermodel/DataFormat.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/DataFormat.java
rename to src/java/org/apache/poi/ss/usermodel/DataFormat.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Drawing.java b/src/java/org/apache/poi/ss/usermodel/Drawing.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Drawing.java
rename to src/java/org/apache/poi/ss/usermodel/Drawing.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FillPatternType.java b/src/java/org/apache/poi/ss/usermodel/FillPatternType.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FillPatternType.java
rename to src/java/org/apache/poi/ss/usermodel/FillPatternType.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Font.java b/src/java/org/apache/poi/ss/usermodel/Font.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Font.java
rename to src/java/org/apache/poi/ss/usermodel/Font.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FontCharset.java b/src/java/org/apache/poi/ss/usermodel/FontCharset.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FontCharset.java
rename to src/java/org/apache/poi/ss/usermodel/FontCharset.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FontFamily.java b/src/java/org/apache/poi/ss/usermodel/FontFamily.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FontFamily.java
rename to src/java/org/apache/poi/ss/usermodel/FontFamily.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FontScheme.java b/src/java/org/apache/poi/ss/usermodel/FontScheme.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FontScheme.java
rename to src/java/org/apache/poi/ss/usermodel/FontScheme.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FontUnderline.java b/src/java/org/apache/poi/ss/usermodel/FontUnderline.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FontUnderline.java
rename to src/java/org/apache/poi/ss/usermodel/FontUnderline.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Footer.java b/src/java/org/apache/poi/ss/usermodel/Footer.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Footer.java
rename to src/java/org/apache/poi/ss/usermodel/Footer.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FormulaError.java b/src/java/org/apache/poi/ss/usermodel/FormulaError.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/FormulaError.java
rename to src/java/org/apache/poi/ss/usermodel/FormulaError.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Header.java b/src/java/org/apache/poi/ss/usermodel/Header.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Header.java
rename to src/java/org/apache/poi/ss/usermodel/Header.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/HorizontalAlignment.java b/src/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/HorizontalAlignment.java
rename to src/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Hyperlink.java b/src/java/org/apache/poi/ss/usermodel/Hyperlink.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Hyperlink.java
rename to src/java/org/apache/poi/ss/usermodel/Hyperlink.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/IndexedColors.java b/src/java/org/apache/poi/ss/usermodel/IndexedColors.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/IndexedColors.java
rename to src/java/org/apache/poi/ss/usermodel/IndexedColors.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Name.java b/src/java/org/apache/poi/ss/usermodel/Name.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Name.java
rename to src/java/org/apache/poi/ss/usermodel/Name.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PageOrder.java b/src/java/org/apache/poi/ss/usermodel/PageOrder.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PageOrder.java
rename to src/java/org/apache/poi/ss/usermodel/PageOrder.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PaperSize.java b/src/java/org/apache/poi/ss/usermodel/PaperSize.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PaperSize.java
rename to src/java/org/apache/poi/ss/usermodel/PaperSize.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Picture.java b/src/java/org/apache/poi/ss/usermodel/Picture.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Picture.java
rename to src/java/org/apache/poi/ss/usermodel/Picture.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PictureData.java b/src/java/org/apache/poi/ss/usermodel/PictureData.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PictureData.java
rename to src/java/org/apache/poi/ss/usermodel/PictureData.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PrintCellComments.java b/src/java/org/apache/poi/ss/usermodel/PrintCellComments.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PrintCellComments.java
rename to src/java/org/apache/poi/ss/usermodel/PrintCellComments.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PrintOrientation.java b/src/java/org/apache/poi/ss/usermodel/PrintOrientation.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PrintOrientation.java
rename to src/java/org/apache/poi/ss/usermodel/PrintOrientation.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PrintSetup.java b/src/java/org/apache/poi/ss/usermodel/PrintSetup.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/PrintSetup.java
rename to src/java/org/apache/poi/ss/usermodel/PrintSetup.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/RichTextString.java b/src/java/org/apache/poi/ss/usermodel/RichTextString.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/RichTextString.java
rename to src/java/org/apache/poi/ss/usermodel/RichTextString.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Row.java b/src/java/org/apache/poi/ss/usermodel/Row.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Row.java
rename to src/java/org/apache/poi/ss/usermodel/Row.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/ShapeTypes.java b/src/java/org/apache/poi/ss/usermodel/ShapeTypes.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/ShapeTypes.java
rename to src/java/org/apache/poi/ss/usermodel/ShapeTypes.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Sheet.java b/src/java/org/apache/poi/ss/usermodel/Sheet.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Sheet.java
rename to src/java/org/apache/poi/ss/usermodel/Sheet.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Textbox.java b/src/java/org/apache/poi/ss/usermodel/Textbox.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Textbox.java
rename to src/java/org/apache/poi/ss/usermodel/Textbox.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/VerticalAlignment.java b/src/java/org/apache/poi/ss/usermodel/VerticalAlignment.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/VerticalAlignment.java
rename to src/java/org/apache/poi/ss/usermodel/VerticalAlignment.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Workbook.java b/src/java/org/apache/poi/ss/usermodel/Workbook.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/ss/usermodel/Workbook.java
rename to src/java/org/apache/poi/ss/usermodel/Workbook.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/AutoShape.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoShape.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/AutoShape.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/AutoShape.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Background.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/Background.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Background.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/Background.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Fill.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/Fill.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Fill.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/Fill.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/FontCollection.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/FontCollection.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/FontCollection.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/FontCollection.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Hyperlink.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/Hyperlink.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Hyperlink.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/Hyperlink.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Line.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/Line.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Line.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/Line.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/LineStyle.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/LineStyle.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/LineStyle.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/LineStyle.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/MasterSheet.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/MasterSheet.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/MasterSheet.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/MasterSheet.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Notes.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/Notes.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Notes.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/Notes.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Picture.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/Picture.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Picture.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/Picture.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/PictureData.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/PictureData.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/PictureData.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/PictureData.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Resources.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/Resources.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Resources.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/Resources.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Shape.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/Shape.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Shape.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/Shape.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/ShapeContainer.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeContainer.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/ShapeContainer.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeContainer.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/ShapeGroup.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeGroup.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/ShapeGroup.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeGroup.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/ShapeTypes.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeTypes.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/ShapeTypes.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeTypes.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Sheet.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/Sheet.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Sheet.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/Sheet.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/SimpleShape.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/SimpleShape.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/SimpleShape.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/SimpleShape.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Slide.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/Slide.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/Slide.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/Slide.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/SlideShow.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/SlideShow.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/SlideShow.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/SlideShow.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/TextBox.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/TextBox.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/TextBox.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/TextBox.java
diff --git a/src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/TextRun.java b/src/scratchpad/src/org/apache/poi/sl/usermodel/TextRun.java
similarity index 100%
rename from src/ooxml/interfaces-jdk15/org/apache/poi/sl/usermodel/TextRun.java
rename to src/scratchpad/src/org/apache/poi/sl/usermodel/TextRun.java