Restructuring and renaming

Signed-off-by: Shivdas Gujare <shivdas.gujare@gmail.com>