Reorganizing some things, fixing the index.