Rearranger.
Javadocs.
Updating documentation to reflect new API.