Rearrange controller classes into a less thrown-together order. Add a few comments on what is where (in the controllers).