Updated to 2.0; moved EnumLike to new util project