diff --git a/msv/src/main/java/com/sun/msv/driver/textui/package.html b/msv/src/main/javadoc/com/sun/msv/driver/textui/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/driver/textui/package.html
rename to msv/src/main/javadoc/com/sun/msv/driver/textui/package.html
diff --git a/msv/src/main/java/com/sun/msv/grammar/package.html b/msv/src/main/javadoc/com/sun/msv/grammar/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/grammar/package.html
rename to msv/src/main/javadoc/com/sun/msv/grammar/package.html
diff --git a/msv/src/main/java/com/sun/msv/grammar/relax/package.html b/msv/src/main/javadoc/com/sun/msv/grammar/relax/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/grammar/relax/package.html
rename to msv/src/main/javadoc/com/sun/msv/grammar/relax/package.html
diff --git a/msv/src/main/java/com/sun/msv/grammar/relaxng/datatype/package.html b/msv/src/main/javadoc/com/sun/msv/grammar/relaxng/datatype/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/grammar/relaxng/datatype/package.html
rename to msv/src/main/javadoc/com/sun/msv/grammar/relaxng/datatype/package.html
diff --git a/msv/src/main/java/com/sun/msv/grammar/trex/package.html b/msv/src/main/javadoc/com/sun/msv/grammar/trex/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/grammar/trex/package.html
rename to msv/src/main/javadoc/com/sun/msv/grammar/trex/package.html
diff --git a/msv/src/main/java/com/sun/msv/grammar/trex/typed/package.html b/msv/src/main/javadoc/com/sun/msv/grammar/trex/typed/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/grammar/trex/typed/package.html
rename to msv/src/main/javadoc/com/sun/msv/grammar/trex/typed/package.html
diff --git a/msv/src/main/java/com/sun/msv/grammar/util/package.html b/msv/src/main/javadoc/com/sun/msv/grammar/util/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/grammar/util/package.html
rename to msv/src/main/javadoc/com/sun/msv/grammar/util/package.html
diff --git a/msv/src/main/java/com/sun/msv/grammar/xmlschema/package.html b/msv/src/main/javadoc/com/sun/msv/grammar/xmlschema/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/grammar/xmlschema/package.html
rename to msv/src/main/javadoc/com/sun/msv/grammar/xmlschema/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/datatype/package.html b/msv/src/main/javadoc/com/sun/msv/reader/datatype/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/datatype/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/datatype/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/datatype/xsd/package.html b/msv/src/main/javadoc/com/sun/msv/reader/datatype/xsd/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/datatype/xsd/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/datatype/xsd/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/dtd/package.html b/msv/src/main/javadoc/com/sun/msv/reader/dtd/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/dtd/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/dtd/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/package.html b/msv/src/main/javadoc/com/sun/msv/reader/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/relax/core/checker/package.html b/msv/src/main/javadoc/com/sun/msv/reader/relax/core/checker/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/relax/core/checker/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/relax/core/checker/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/relax/core/package.html b/msv/src/main/javadoc/com/sun/msv/reader/relax/core/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/relax/core/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/relax/core/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/relax/package.html b/msv/src/main/javadoc/com/sun/msv/reader/relax/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/relax/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/relax/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/trex/classic/package.html b/msv/src/main/javadoc/com/sun/msv/reader/trex/classic/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/trex/classic/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/trex/classic/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/trex/ng/comp/package.html b/msv/src/main/javadoc/com/sun/msv/reader/trex/ng/comp/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/trex/ng/comp/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/trex/ng/comp/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/trex/ng/package.html b/msv/src/main/javadoc/com/sun/msv/reader/trex/ng/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/trex/ng/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/trex/ng/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/trex/package.html b/msv/src/main/javadoc/com/sun/msv/reader/trex/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/trex/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/trex/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/trex/typed/package.html b/msv/src/main/javadoc/com/sun/msv/reader/trex/typed/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/trex/typed/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/trex/typed/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/util/package.html b/msv/src/main/javadoc/com/sun/msv/reader/util/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/util/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/util/package.html
diff --git a/msv/src/main/java/com/sun/msv/reader/xmlschema/doc-files/redefine.vsd b/msv/src/main/javadoc/com/sun/msv/reader/xmlschema/doc-files/redefine.vsd
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/xmlschema/doc-files/redefine.vsd
rename to msv/src/main/javadoc/com/sun/msv/reader/xmlschema/doc-files/redefine.vsd
diff --git a/msv/src/main/java/com/sun/msv/reader/xmlschema/doc-files/redefine1.gif b/msv/src/main/javadoc/com/sun/msv/reader/xmlschema/doc-files/redefine1.gif
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/xmlschema/doc-files/redefine1.gif
rename to msv/src/main/javadoc/com/sun/msv/reader/xmlschema/doc-files/redefine1.gif
diff --git a/msv/src/main/java/com/sun/msv/reader/xmlschema/doc-files/redefine2.gif b/msv/src/main/javadoc/com/sun/msv/reader/xmlschema/doc-files/redefine2.gif
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/xmlschema/doc-files/redefine2.gif
rename to msv/src/main/javadoc/com/sun/msv/reader/xmlschema/doc-files/redefine2.gif
diff --git a/msv/src/main/java/com/sun/msv/reader/xmlschema/doc-files/redefine3.gif b/msv/src/main/javadoc/com/sun/msv/reader/xmlschema/doc-files/redefine3.gif
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/xmlschema/doc-files/redefine3.gif
rename to msv/src/main/javadoc/com/sun/msv/reader/xmlschema/doc-files/redefine3.gif
diff --git a/msv/src/main/java/com/sun/msv/reader/xmlschema/doc-files/redefine4.gif b/msv/src/main/javadoc/com/sun/msv/reader/xmlschema/doc-files/redefine4.gif
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/xmlschema/doc-files/redefine4.gif
rename to msv/src/main/javadoc/com/sun/msv/reader/xmlschema/doc-files/redefine4.gif
diff --git a/msv/src/main/java/com/sun/msv/reader/xmlschema/package.html b/msv/src/main/javadoc/com/sun/msv/reader/xmlschema/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/reader/xmlschema/package.html
rename to msv/src/main/javadoc/com/sun/msv/reader/xmlschema/package.html
diff --git a/msv/src/main/java/com/sun/msv/relaxns/grammar/package.html b/msv/src/main/javadoc/com/sun/msv/relaxns/grammar/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/relaxns/grammar/package.html
rename to msv/src/main/javadoc/com/sun/msv/relaxns/grammar/package.html
diff --git a/msv/src/main/java/com/sun/msv/relaxns/grammar/relax/package.html b/msv/src/main/javadoc/com/sun/msv/relaxns/grammar/relax/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/relaxns/grammar/relax/package.html
rename to msv/src/main/javadoc/com/sun/msv/relaxns/grammar/relax/package.html
diff --git a/msv/src/main/java/com/sun/msv/relaxns/grammar/trex/package.html b/msv/src/main/javadoc/com/sun/msv/relaxns/grammar/trex/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/relaxns/grammar/trex/package.html
rename to msv/src/main/javadoc/com/sun/msv/relaxns/grammar/trex/package.html
diff --git a/msv/src/main/java/com/sun/msv/relaxns/reader/package.html b/msv/src/main/javadoc/com/sun/msv/relaxns/reader/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/relaxns/reader/package.html
rename to msv/src/main/javadoc/com/sun/msv/relaxns/reader/package.html
diff --git a/msv/src/main/java/com/sun/msv/relaxns/reader/relax/package.html b/msv/src/main/javadoc/com/sun/msv/relaxns/reader/relax/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/relaxns/reader/relax/package.html
rename to msv/src/main/javadoc/com/sun/msv/relaxns/reader/relax/package.html
diff --git a/msv/src/main/java/com/sun/msv/relaxns/reader/trex/package.html b/msv/src/main/javadoc/com/sun/msv/relaxns/reader/trex/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/relaxns/reader/trex/package.html
rename to msv/src/main/javadoc/com/sun/msv/relaxns/reader/trex/package.html
diff --git a/msv/src/main/java/com/sun/msv/relaxns/verifier/package.html b/msv/src/main/javadoc/com/sun/msv/relaxns/verifier/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/relaxns/verifier/package.html
rename to msv/src/main/javadoc/com/sun/msv/relaxns/verifier/package.html
diff --git a/msv/src/main/java/com/sun/msv/scanner/dtd/package.html b/msv/src/main/javadoc/com/sun/msv/scanner/dtd/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/scanner/dtd/package.html
rename to msv/src/main/javadoc/com/sun/msv/scanner/dtd/package.html
diff --git a/msv/src/main/java/com/sun/msv/util/package.html b/msv/src/main/javadoc/com/sun/msv/util/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/util/package.html
rename to msv/src/main/javadoc/com/sun/msv/util/package.html
diff --git a/msv/src/main/java/com/sun/msv/verifier/identity/package.html b/msv/src/main/javadoc/com/sun/msv/verifier/identity/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/verifier/identity/package.html
rename to msv/src/main/javadoc/com/sun/msv/verifier/identity/package.html
diff --git a/msv/src/main/java/com/sun/msv/verifier/jarv/package.html b/msv/src/main/javadoc/com/sun/msv/verifier/jarv/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/verifier/jarv/package.html
rename to msv/src/main/javadoc/com/sun/msv/verifier/jarv/package.html
diff --git a/msv/src/main/java/com/sun/msv/verifier/package.html b/msv/src/main/javadoc/com/sun/msv/verifier/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/verifier/package.html
rename to msv/src/main/javadoc/com/sun/msv/verifier/package.html
diff --git a/msv/src/main/java/com/sun/msv/verifier/psvi/package.html b/msv/src/main/javadoc/com/sun/msv/verifier/psvi/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/verifier/psvi/package.html
rename to msv/src/main/javadoc/com/sun/msv/verifier/psvi/package.html
diff --git a/msv/src/main/java/com/sun/msv/verifier/regexp/package.html b/msv/src/main/javadoc/com/sun/msv/verifier/regexp/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/verifier/regexp/package.html
rename to msv/src/main/javadoc/com/sun/msv/verifier/regexp/package.html
diff --git a/msv/src/main/java/com/sun/msv/verifier/regexp/xmlschema/package.html b/msv/src/main/javadoc/com/sun/msv/verifier/regexp/xmlschema/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/verifier/regexp/xmlschema/package.html
rename to msv/src/main/javadoc/com/sun/msv/verifier/regexp/xmlschema/package.html
diff --git a/msv/src/main/java/com/sun/msv/verifier/util/package.html b/msv/src/main/javadoc/com/sun/msv/verifier/util/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/verifier/util/package.html
rename to msv/src/main/javadoc/com/sun/msv/verifier/util/package.html
diff --git a/msv/src/main/java/com/sun/msv/writer/relaxng/doc-files/Island.gif b/msv/src/main/javadoc/com/sun/msv/writer/relaxng/doc-files/Island.gif
similarity index 100%
rename from msv/src/main/java/com/sun/msv/writer/relaxng/doc-files/Island.gif
rename to msv/src/main/javadoc/com/sun/msv/writer/relaxng/doc-files/Island.gif
diff --git a/msv/src/main/java/com/sun/msv/writer/relaxng/doc-files/Island_Before.gif b/msv/src/main/javadoc/com/sun/msv/writer/relaxng/doc-files/Island_Before.gif
similarity index 100%
rename from msv/src/main/java/com/sun/msv/writer/relaxng/doc-files/Island_Before.gif
rename to msv/src/main/javadoc/com/sun/msv/writer/relaxng/doc-files/Island_Before.gif
diff --git a/msv/src/main/java/com/sun/msv/writer/relaxng/doc-files/Island_Merged.gif b/msv/src/main/javadoc/com/sun/msv/writer/relaxng/doc-files/Island_Merged.gif
similarity index 100%
rename from msv/src/main/java/com/sun/msv/writer/relaxng/doc-files/Island_Merged.gif
rename to msv/src/main/javadoc/com/sun/msv/writer/relaxng/doc-files/Island_Merged.gif
diff --git a/msv/src/main/java/com/sun/msv/writer/relaxng/doc-files/RELAXNGWriter.vsd b/msv/src/main/javadoc/com/sun/msv/writer/relaxng/doc-files/RELAXNGWriter.vsd
similarity index 100%
rename from msv/src/main/java/com/sun/msv/writer/relaxng/doc-files/RELAXNGWriter.vsd
rename to msv/src/main/javadoc/com/sun/msv/writer/relaxng/doc-files/RELAXNGWriter.vsd
diff --git a/msv/src/main/java/com/sun/msv/writer/relaxng/doc-files/simpleAGM.gif b/msv/src/main/javadoc/com/sun/msv/writer/relaxng/doc-files/simpleAGM.gif
similarity index 100%
rename from msv/src/main/java/com/sun/msv/writer/relaxng/doc-files/simpleAGM.gif
rename to msv/src/main/javadoc/com/sun/msv/writer/relaxng/doc-files/simpleAGM.gif
diff --git a/msv/src/main/java/com/sun/msv/writer/relaxng/package.html b/msv/src/main/javadoc/com/sun/msv/writer/relaxng/package.html
similarity index 100%
rename from msv/src/main/java/com/sun/msv/writer/relaxng/package.html
rename to msv/src/main/javadoc/com/sun/msv/writer/relaxng/package.html
diff --git a/msv/src/main/java/overview.html b/msv/src/main/javadoc/overview.html
similarity index 100%
rename from msv/src/main/java/overview.html
rename to msv/src/main/javadoc/overview.html
diff --git a/xsdlib/src/main/java/com/sun/msv/datatype/xsd/package.html b/xsdlib/src/main/javadoc/com/sun/msv/datatype/xsd/package.html
similarity index 100%
rename from xsdlib/src/main/java/com/sun/msv/datatype/xsd/package.html
rename to xsdlib/src/main/javadoc/com/sun/msv/datatype/xsd/package.html
diff --git a/xsdlib/src/test/java/com/sun/msv/datatype/xsd/conformance/package.html b/xsdlib/src/test/javadoc/com/sun/msv/datatype/xsd/conformance/package.html
similarity index 100%
rename from xsdlib/src/test/java/com/sun/msv/datatype/xsd/conformance/package.html
rename to xsdlib/src/test/javadoc/com/sun/msv/datatype/xsd/conformance/package.html