Rearrangement of the CFI folder