Re-or-organize some stuffs

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