Reorganize some

Change-Id: Ie8283755637711d95079cfd52a15a5099f0aa32a