Made some significant changes to utility packages and classes.