Further restructuring

Signed-off-by: Harshavardhana <fharshav@redhat.com>