Move files around (2/2)

Change-Id: I674e2761d5bbebb2d008890d486baf72f4a48dac
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>