Restructure player objects