Added Javadoc and changed class names