Restructure of todos in architecture.