Update, organize, and add a few Gems