Organizing into Base and FIM scripts