No code change, javadoc

and regrouped the class
Javadoc, no code change.