Moved cabinets to infrastructure from templates. #328