Fixed load/save XML
Add data directory