remove deft, rearrange agenda files