Yet more reorganizing
Added todo
Reorganizing yet again