Fixed the source directory with updates from Jesse.