Refactoring, and adding of skeleton classes

Signed-off-by: Shashir Reddy <shashir@wibidata.com>