move deployment related bits to their own group