Restructure plugin so it gets initialized properly.
Restructure for ease of use.