Fix turbulence calculations
Rename files