Minor internal restructure.