New KPI file structure
Merge origin/master