fix some calc error, move parsed files into different folders