Renamed files, and updated user's guide