Change tabulations to white spaces and move reporting to parent
Remove TODO.md
Merged with securez/master