More changes to replace package structure to blend with mahout's package structure