Reorganizing to support multiple kickstart configurations