PSI: reorder new-plugin patch and added comments