Rearranged a few files, added quiz2, finished 2.3 and started 2.5