Revising organization of Plugins

To make it easier to distinguish them in the program handles.