PSO restructuring