diff --git a/build.xml b/build.xml
index ed03954..5962ecc 100755
--- a/build.xml
+++ b/build.xml
@@ -35,7 +35,7 @@
 	<!-- Directories -->
 
 	<!-- Sources -->
-	<property name="srcDir" location="src" />
+	<property name="srcDir" location="src/java" />
 
 	<!-- Output directory for the build process -->
 	<property name="buildDir" location="build" />
diff --git a/src/com/digitalpebble/classification/Document.java b/src/java/com/digitalpebble/classification/Document.java
similarity index 100%
rename from src/com/digitalpebble/classification/Document.java
rename to src/java/com/digitalpebble/classification/Document.java
diff --git a/src/com/digitalpebble/classification/Field.java b/src/java/com/digitalpebble/classification/Field.java
similarity index 100%
rename from src/com/digitalpebble/classification/Field.java
rename to src/java/com/digitalpebble/classification/Field.java
diff --git a/src/com/digitalpebble/classification/FileTrainingCorpus.java b/src/java/com/digitalpebble/classification/FileTrainingCorpus.java
similarity index 100%
rename from src/com/digitalpebble/classification/FileTrainingCorpus.java
rename to src/java/com/digitalpebble/classification/FileTrainingCorpus.java
diff --git a/src/com/digitalpebble/classification/Learner.java b/src/java/com/digitalpebble/classification/Learner.java
similarity index 100%
rename from src/com/digitalpebble/classification/Learner.java
rename to src/java/com/digitalpebble/classification/Learner.java
diff --git a/src/com/digitalpebble/classification/Lexicon.java b/src/java/com/digitalpebble/classification/Lexicon.java
similarity index 100%
rename from src/com/digitalpebble/classification/Lexicon.java
rename to src/java/com/digitalpebble/classification/Lexicon.java
diff --git a/src/com/digitalpebble/classification/MultiFieldDocument.java b/src/java/com/digitalpebble/classification/MultiFieldDocument.java
similarity index 100%
rename from src/com/digitalpebble/classification/MultiFieldDocument.java
rename to src/java/com/digitalpebble/classification/MultiFieldDocument.java
diff --git a/src/com/digitalpebble/classification/Parameters.java b/src/java/com/digitalpebble/classification/Parameters.java
similarity index 100%
rename from src/com/digitalpebble/classification/Parameters.java
rename to src/java/com/digitalpebble/classification/Parameters.java
diff --git a/src/com/digitalpebble/classification/RAMTrainingCorpus.java b/src/java/com/digitalpebble/classification/RAMTrainingCorpus.java
similarity index 100%
rename from src/com/digitalpebble/classification/RAMTrainingCorpus.java
rename to src/java/com/digitalpebble/classification/RAMTrainingCorpus.java
diff --git a/src/com/digitalpebble/classification/SimpleDocument.java b/src/java/com/digitalpebble/classification/SimpleDocument.java
similarity index 100%
rename from src/com/digitalpebble/classification/SimpleDocument.java
rename to src/java/com/digitalpebble/classification/SimpleDocument.java
diff --git a/src/com/digitalpebble/classification/TextClassifier.java b/src/java/com/digitalpebble/classification/TextClassifier.java
similarity index 100%
rename from src/com/digitalpebble/classification/TextClassifier.java
rename to src/java/com/digitalpebble/classification/TextClassifier.java
diff --git a/src/com/digitalpebble/classification/TrainingCorpus.java b/src/java/com/digitalpebble/classification/TrainingCorpus.java
similarity index 100%
rename from src/com/digitalpebble/classification/TrainingCorpus.java
rename to src/java/com/digitalpebble/classification/TrainingCorpus.java
diff --git a/src/com/digitalpebble/classification/Vector.java b/src/java/com/digitalpebble/classification/Vector.java
similarity index 100%
rename from src/com/digitalpebble/classification/Vector.java
rename to src/java/com/digitalpebble/classification/Vector.java
diff --git a/src/com/digitalpebble/classification/liblinear/LibLinearApplier.java b/src/java/com/digitalpebble/classification/liblinear/LibLinearApplier.java
similarity index 100%
rename from src/com/digitalpebble/classification/liblinear/LibLinearApplier.java
rename to src/java/com/digitalpebble/classification/liblinear/LibLinearApplier.java
diff --git a/src/com/digitalpebble/classification/liblinear/LibLinearClassifier.java b/src/java/com/digitalpebble/classification/liblinear/LibLinearClassifier.java
similarity index 100%
rename from src/com/digitalpebble/classification/liblinear/LibLinearClassifier.java
rename to src/java/com/digitalpebble/classification/liblinear/LibLinearClassifier.java
diff --git a/src/com/digitalpebble/classification/liblinear/LibLinearModelCreator.java b/src/java/com/digitalpebble/classification/liblinear/LibLinearModelCreator.java
similarity index 100%
rename from src/com/digitalpebble/classification/liblinear/LibLinearModelCreator.java
rename to src/java/com/digitalpebble/classification/liblinear/LibLinearModelCreator.java
diff --git a/src/com/digitalpebble/classification/libsvm/LibSVMClassifier.java b/src/java/com/digitalpebble/classification/libsvm/LibSVMClassifier.java
similarity index 100%
rename from src/com/digitalpebble/classification/libsvm/LibSVMClassifier.java
rename to src/java/com/digitalpebble/classification/libsvm/LibSVMClassifier.java
diff --git a/src/com/digitalpebble/classification/libsvm/LibSVMModelCreator.java b/src/java/com/digitalpebble/classification/libsvm/LibSVMModelCreator.java
similarity index 100%
rename from src/com/digitalpebble/classification/libsvm/LibSVMModelCreator.java
rename to src/java/com/digitalpebble/classification/libsvm/LibSVMModelCreator.java
diff --git a/src/com/digitalpebble/classification/libsvm/Utils.java b/src/java/com/digitalpebble/classification/libsvm/Utils.java
similarity index 100%
rename from src/com/digitalpebble/classification/libsvm/Utils.java
rename to src/java/com/digitalpebble/classification/libsvm/Utils.java
diff --git a/src/com/digitalpebble/classification/util/AttributeScorer.java b/src/java/com/digitalpebble/classification/util/AttributeScorer.java
similarity index 100%
rename from src/com/digitalpebble/classification/util/AttributeScorer.java
rename to src/java/com/digitalpebble/classification/util/AttributeScorer.java
diff --git a/src/com/digitalpebble/classification/util/CorpusUtils.java b/src/java/com/digitalpebble/classification/util/CorpusUtils.java
similarity index 100%
rename from src/com/digitalpebble/classification/util/CorpusUtils.java
rename to src/java/com/digitalpebble/classification/util/CorpusUtils.java
diff --git a/src/com/digitalpebble/classification/util/ModelUtils.java b/src/java/com/digitalpebble/classification/util/ModelUtils.java
similarity index 100%
rename from src/com/digitalpebble/classification/util/ModelUtils.java
rename to src/java/com/digitalpebble/classification/util/ModelUtils.java
diff --git a/src/com/digitalpebble/classification/util/Stemmer.java b/src/java/com/digitalpebble/classification/util/Stemmer.java
similarity index 100%
rename from src/com/digitalpebble/classification/util/Stemmer.java
rename to src/java/com/digitalpebble/classification/util/Stemmer.java
diff --git a/src/com/digitalpebble/classification/util/UnZip.java b/src/java/com/digitalpebble/classification/util/UnZip.java
similarity index 100%
rename from src/com/digitalpebble/classification/util/UnZip.java
rename to src/java/com/digitalpebble/classification/util/UnZip.java
diff --git a/src/com/digitalpebble/classification/util/XMLCorpusClassifier.java b/src/java/com/digitalpebble/classification/util/XMLCorpusClassifier.java
similarity index 100%
rename from src/com/digitalpebble/classification/util/XMLCorpusClassifier.java
rename to src/java/com/digitalpebble/classification/util/XMLCorpusClassifier.java
diff --git a/src/com/digitalpebble/classification/util/XMLCorpusReader.java b/src/java/com/digitalpebble/classification/util/XMLCorpusReader.java
similarity index 100%
rename from src/com/digitalpebble/classification/util/XMLCorpusReader.java
rename to src/java/com/digitalpebble/classification/util/XMLCorpusReader.java
diff --git a/src/com/digitalpebble/classification/util/chiSquareAttributeScorer.java b/src/java/com/digitalpebble/classification/util/chiSquareAttributeScorer.java
similarity index 100%
rename from src/com/digitalpebble/classification/util/chiSquareAttributeScorer.java
rename to src/java/com/digitalpebble/classification/util/chiSquareAttributeScorer.java
diff --git a/src/com/digitalpebble/classification/util/logLikelihoodAttributeScorer.java b/src/java/com/digitalpebble/classification/util/logLikelihoodAttributeScorer.java
similarity index 100%
rename from src/com/digitalpebble/classification/util/logLikelihoodAttributeScorer.java
rename to src/java/com/digitalpebble/classification/util/logLikelihoodAttributeScorer.java
diff --git a/src/libsvm/svm.java b/src/java/libsvm/svm.java
similarity index 100%
rename from src/libsvm/svm.java
rename to src/java/libsvm/svm.java
diff --git a/src/libsvm/svm_model.java b/src/java/libsvm/svm_model.java
similarity index 100%
rename from src/libsvm/svm_model.java
rename to src/java/libsvm/svm_model.java
diff --git a/src/libsvm/svm_node.java b/src/java/libsvm/svm_node.java
similarity index 100%
rename from src/libsvm/svm_node.java
rename to src/java/libsvm/svm_node.java
diff --git a/src/libsvm/svm_parameter.java b/src/java/libsvm/svm_parameter.java
similarity index 100%
rename from src/libsvm/svm_parameter.java
rename to src/java/libsvm/svm_parameter.java
diff --git a/src/libsvm/svm_problem.java b/src/java/libsvm/svm_problem.java
similarity index 100%
rename from src/libsvm/svm_problem.java
rename to src/java/libsvm/svm_problem.java
diff --git a/src/libsvm/svm_problem_impl.java b/src/java/libsvm/svm_problem_impl.java
similarity index 100%
rename from src/libsvm/svm_problem_impl.java
rename to src/java/libsvm/svm_problem_impl.java
diff --git a/src/com/digitalpebble/classification/test/AbstractLearnerTest.java b/src/test/com/digitalpebble/classification/test/AbstractLearnerTest.java
similarity index 100%
rename from src/com/digitalpebble/classification/test/AbstractLearnerTest.java
rename to src/test/com/digitalpebble/classification/test/AbstractLearnerTest.java
diff --git a/src/com/digitalpebble/classification/test/TestMultiFieldDocs.java b/src/test/com/digitalpebble/classification/test/TestMultiFieldDocs.java
similarity index 100%
rename from src/com/digitalpebble/classification/test/TestMultiFieldDocs.java
rename to src/test/com/digitalpebble/classification/test/TestMultiFieldDocs.java
diff --git a/src/com/digitalpebble/classification/test/TestWeightingSchemes.java b/src/test/com/digitalpebble/classification/test/TestWeightingSchemes.java
similarity index 100%
rename from src/com/digitalpebble/classification/test/TestWeightingSchemes.java
rename to src/test/com/digitalpebble/classification/test/TestWeightingSchemes.java
diff --git a/src/com/digitalpebble/classification/test/TrainingCorpus.java b/src/test/com/digitalpebble/classification/test/TrainingCorpus.java
similarity index 100%
rename from src/com/digitalpebble/classification/test/TrainingCorpus.java
rename to src/test/com/digitalpebble/classification/test/TrainingCorpus.java
diff --git a/src/com/digitalpebble/classification/test/classifyDoc.java b/src/test/com/digitalpebble/classification/test/classifyDoc.java
similarity index 100%
rename from src/com/digitalpebble/classification/test/classifyDoc.java
rename to src/test/com/digitalpebble/classification/test/classifyDoc.java