Change up XML structure to make it easier to load keyboard XML from S3