[PVP] Major restructuring