Added __init__.py file for importing modules and other bug fixes

Signed-off-by: M S Vishwanath Bhat <vbhat@redhat.com>