yuga: reorganize and cleanup

Change-Id: Ie76952eb78446de283d46e7c90ed86b13d102fd5