Major updates to XML layout, resource naming.