Move martin_liu.xml inside FateCore, some reformatting