complete problem2 and reorg files