reorganize more files

Change-Id: I97078c1bc47251a728a93685ad38ae9569ee8492