upgrade savon to 2.0.2, organize directory structure