A bit of restructuring

Signed-off-by: Harshavardhana <harsha@pumkin.org>