Move files around (1/2)

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