Re-orginze the plugin as instantiated classes