Refactored TodoDemo (moved folders around, etc).