#4018 fix NPE in DefaultTermComparator
Added documentation
refactoring of package names for consistency