Mutt tweaks, org reorganization