New structure, and performance data format corrected
New directory layouth