Reorganize plugin structure