restructured, javadoc, let tests check model object class