Update TODO
Wrap everything in modules.

This fixes the bug where things in different files with the same name
clash.
Update TODO