Upgrade for FI 1.3 directory structure