Move more plugins from system-space to user-space