reorg and adding white and black scripts and data