Annotated a bunch of files, moved some things around, and did some general cleanup