Structural changes and fixing of Javadocs