Lab 2 to its own folder, lots of other updates