tsubasa: reorganize and cleanup (2)

Change-Id: Iaea7c041adf7ccfd5309343d217d86946ef967d7