Added Javadocs, moved some classes.