Switch AND over to multi-file format