Add TODO file
Fix TODO
Move todo to readme
Rename files for clarit
Title case on output
Small tweaks