diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/AutoShape.java b/src/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 src/java/org/apache/poi/sl/usermodel/AutoShape.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Background.java b/src/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 src/java/org/apache/poi/sl/usermodel/Background.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Fill.java b/src/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 src/java/org/apache/poi/sl/usermodel/Fill.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/FontCollection.java b/src/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 src/java/org/apache/poi/sl/usermodel/FontCollection.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Hyperlink.java b/src/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 src/java/org/apache/poi/sl/usermodel/Hyperlink.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Line.java b/src/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 src/java/org/apache/poi/sl/usermodel/Line.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/LineStyle.java b/src/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 src/java/org/apache/poi/sl/usermodel/LineStyle.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/MasterSheet.java b/src/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 src/java/org/apache/poi/sl/usermodel/MasterSheet.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Notes.java b/src/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 src/java/org/apache/poi/sl/usermodel/Notes.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Picture.java b/src/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 src/java/org/apache/poi/sl/usermodel/Picture.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/PictureData.java b/src/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 src/java/org/apache/poi/sl/usermodel/PictureData.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Resources.java b/src/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 src/java/org/apache/poi/sl/usermodel/Resources.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Shape.java b/src/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 src/java/org/apache/poi/sl/usermodel/Shape.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeContainer.java b/src/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 src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeGroup.java b/src/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 src/java/org/apache/poi/sl/usermodel/ShapeGroup.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/ShapeTypes.java b/src/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 src/java/org/apache/poi/sl/usermodel/ShapeTypes.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Sheet.java b/src/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 src/java/org/apache/poi/sl/usermodel/Sheet.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/SimpleShape.java b/src/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 src/java/org/apache/poi/sl/usermodel/SimpleShape.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/Slide.java b/src/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 src/java/org/apache/poi/sl/usermodel/Slide.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/SlideShow.java b/src/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 src/java/org/apache/poi/sl/usermodel/SlideShow.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/TextBox.java b/src/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 src/java/org/apache/poi/sl/usermodel/TextBox.java
diff --git a/src/scratchpad/src/org/apache/poi/sl/usermodel/TextRun.java b/src/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 src/java/org/apache/poi/sl/usermodel/TextRun.java
diff --git a/src/scratchpad/src/org/apache/poi/wp/usermodel/CharacterRun.java b/src/java/org/apache/poi/wp/usermodel/CharacterRun.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/wp/usermodel/CharacterRun.java
rename to src/java/org/apache/poi/wp/usermodel/CharacterRun.java
diff --git a/src/scratchpad/src/org/apache/poi/wp/usermodel/Paragraph.java b/src/java/org/apache/poi/wp/usermodel/Paragraph.java
similarity index 100%
rename from src/scratchpad/src/org/apache/poi/wp/usermodel/Paragraph.java
rename to src/java/org/apache/poi/wp/usermodel/Paragraph.java