A bunch of re-organization

Most notably getting the bibliography working again