Changed file system + retabbing
Moved xml into data folder