diff --git a/Utilities/CAI/inc/cderror.h b/Utilities/CAI/inc/ext_inc/cderror.h
similarity index 100%
rename from Utilities/CAI/inc/cderror.h
rename to Utilities/CAI/inc/ext_inc/cderror.h
diff --git a/Utilities/CAI/inc/cdjpeg.h b/Utilities/CAI/inc/ext_inc/cdjpeg.h
similarity index 100%
rename from Utilities/CAI/inc/cdjpeg.h
rename to Utilities/CAI/inc/ext_inc/cdjpeg.h
diff --git a/Utilities/CAI/inc/jchuff.h b/Utilities/CAI/inc/ext_inc/jchuff.h
similarity index 100%
rename from Utilities/CAI/inc/jchuff.h
rename to Utilities/CAI/inc/ext_inc/jchuff.h
diff --git a/Utilities/CAI/inc/jconfig.h b/Utilities/CAI/inc/ext_inc/jconfig.h
similarity index 100%
rename from Utilities/CAI/inc/jconfig.h
rename to Utilities/CAI/inc/ext_inc/jconfig.h
diff --git a/Utilities/CAI/inc/jdct.h b/Utilities/CAI/inc/ext_inc/jdct.h
similarity index 100%
rename from Utilities/CAI/inc/jdct.h
rename to Utilities/CAI/inc/ext_inc/jdct.h
diff --git a/Utilities/CAI/inc/jdhuff.h b/Utilities/CAI/inc/ext_inc/jdhuff.h
similarity index 100%
rename from Utilities/CAI/inc/jdhuff.h
rename to Utilities/CAI/inc/ext_inc/jdhuff.h
diff --git a/Utilities/CAI/inc/jerror.h b/Utilities/CAI/inc/ext_inc/jerror.h
similarity index 100%
rename from Utilities/CAI/inc/jerror.h
rename to Utilities/CAI/inc/ext_inc/jerror.h
diff --git a/Utilities/CAI/inc/jinclude.h b/Utilities/CAI/inc/ext_inc/jinclude.h
similarity index 100%
rename from Utilities/CAI/inc/jinclude.h
rename to Utilities/CAI/inc/ext_inc/jinclude.h
diff --git a/Utilities/CAI/inc/jmemsys.h b/Utilities/CAI/inc/ext_inc/jmemsys.h
similarity index 100%
rename from Utilities/CAI/inc/jmemsys.h
rename to Utilities/CAI/inc/ext_inc/jmemsys.h
diff --git a/Utilities/CAI/inc/jmorecfg.h b/Utilities/CAI/inc/ext_inc/jmorecfg.h
similarity index 100%
rename from Utilities/CAI/inc/jmorecfg.h
rename to Utilities/CAI/inc/ext_inc/jmorecfg.h
diff --git a/Utilities/CAI/inc/jpegint.h b/Utilities/CAI/inc/ext_inc/jpegint.h
similarity index 100%
rename from Utilities/CAI/inc/jpegint.h
rename to Utilities/CAI/inc/ext_inc/jpegint.h
diff --git a/Utilities/CAI/inc/jpeglib.h b/Utilities/CAI/inc/ext_inc/jpeglib.h
similarity index 100%
rename from Utilities/CAI/inc/jpeglib.h
rename to Utilities/CAI/inc/ext_inc/jpeglib.h
diff --git a/Utilities/CAI/inc/jversion.h b/Utilities/CAI/inc/ext_inc/jversion.h
similarity index 100%
rename from Utilities/CAI/inc/jversion.h
rename to Utilities/CAI/inc/ext_inc/jversion.h
diff --git a/Utilities/CAI/inc/machdep.h b/Utilities/CAI/inc/ext_inc/machdep.h
similarity index 100%
rename from Utilities/CAI/inc/machdep.h
rename to Utilities/CAI/inc/ext_inc/machdep.h
diff --git a/Utilities/CAI/inc/port.h b/Utilities/CAI/inc/ext_inc/port.h
similarity index 100%
rename from Utilities/CAI/inc/port.h
rename to Utilities/CAI/inc/ext_inc/port.h
diff --git a/Utilities/CAI/inc/t4.h b/Utilities/CAI/inc/ext_inc/t4.h
similarity index 100%
rename from Utilities/CAI/inc/t4.h
rename to Utilities/CAI/inc/ext_inc/t4.h
diff --git a/Utilities/CAI/inc/tif_dir.h b/Utilities/CAI/inc/ext_inc/tif_dir.h
similarity index 100%
rename from Utilities/CAI/inc/tif_dir.h
rename to Utilities/CAI/inc/ext_inc/tif_dir.h
diff --git a/Utilities/CAI/inc/tif_fax3.h b/Utilities/CAI/inc/ext_inc/tif_fax3.h
similarity index 100%
rename from Utilities/CAI/inc/tif_fax3.h
rename to Utilities/CAI/inc/ext_inc/tif_fax3.h
diff --git a/Utilities/CAI/inc/tif_predict.h b/Utilities/CAI/inc/ext_inc/tif_predict.h
similarity index 100%
rename from Utilities/CAI/inc/tif_predict.h
rename to Utilities/CAI/inc/ext_inc/tif_predict.h
diff --git a/Utilities/CAI/inc/tiff.h b/Utilities/CAI/inc/ext_inc/tiff.h
similarity index 100%
rename from Utilities/CAI/inc/tiff.h
rename to Utilities/CAI/inc/ext_inc/tiff.h
diff --git a/Utilities/CAI/inc/tiffcomp.h b/Utilities/CAI/inc/ext_inc/tiffcomp.h
similarity index 100%
rename from Utilities/CAI/inc/tiffcomp.h
rename to Utilities/CAI/inc/ext_inc/tiffcomp.h
diff --git a/Utilities/CAI/inc/tiffconf.h b/Utilities/CAI/inc/ext_inc/tiffconf.h
similarity index 100%
rename from Utilities/CAI/inc/tiffconf.h
rename to Utilities/CAI/inc/ext_inc/tiffconf.h
diff --git a/Utilities/CAI/inc/tiffio.h b/Utilities/CAI/inc/ext_inc/tiffio.h
similarity index 100%
rename from Utilities/CAI/inc/tiffio.h
rename to Utilities/CAI/inc/ext_inc/tiffio.h
diff --git a/Utilities/CAI/inc/tiffiop.h b/Utilities/CAI/inc/ext_inc/tiffiop.h
similarity index 100%
rename from Utilities/CAI/inc/tiffiop.h
rename to Utilities/CAI/inc/ext_inc/tiffiop.h
diff --git a/Utilities/CAI/inc/uvcode.h b/Utilities/CAI/inc/ext_inc/uvcode.h
similarity index 100%
rename from Utilities/CAI/inc/uvcode.h
rename to Utilities/CAI/inc/ext_inc/uvcode.h
diff --git a/Utilities/CAI/inc/version.h b/Utilities/CAI/inc/ext_inc/version.h
similarity index 100%
rename from Utilities/CAI/inc/version.h
rename to Utilities/CAI/inc/ext_inc/version.h