Add support for multi-file packages