Re-factored plugin packages