Re-organizing... 1 class, 1 file

Also... adding TODOs