Organized code a bit (it's not all in one file now).  Entomology is still in progress.