Merge "Fixed setting yang sources to modules."