reorg files and start lab 2