tsubasa: reorganize and cleanup

Change-Id: I0eceddf7a74728ddfdefd9b8ce05487db46199ef
Signed-off-by: ChampionSwimmer <android@championswimmer.tk>