Update to reflect the move of components out of labs