reorganize plugin