Fixed Encoding Issues, Changed /data/ folder structure