Code, JAVA doc, structure refactor.