Restructered todos