rearrange package structure
CSV double qoutes handled