Re-organisation of the BIFs folder structure
Updated folder structure