File reorg and additional scripts