Plugins: finish moving plugins