Re-arrange a couple deployment groups for production and staging