Refactoring of package names. Elimination of associated isWeighted methods. Changed method names to be more descriptive.