Changed folder structure to reflect CFO family