Split DELETE into DeleteOne & DeleteMany
Fix gather for packages named 'main'