reorg and most of hw2 p1