Integrate cleanup into box command
Organise the kickstart file