Package reorganization, remove "plugins"