updating paths for Yeti
merged yeti changes into master