rm py files, change dir struct
remove defer