Javadocs and a few class movements.