Fixing package names so things compile. Removing Boolean and Transform usages in ComparatorUtils as those classes didn't come accross