Reorganize plugin