re-organize some of the plugins to different packages