reorg and readme update