Cleaned todos
Renamed some classes
Added a few todos