Refactoring package name and adding Javadoc info.