kaizen: pop stuff done, rearrange stuff

Signed-off-by: Rohit Yadav <bhaisaab@baagi.org>