Use new directory structure for PHP cartridge