Reorganization of awaiter and playstate