Updated xml field layout and tweaked media folder layout.