reorganization

Plugin as been reorganized to mach a better order