Clean up and move some resources to the right file.

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