Fixed some file naming inconsistencies
Added some TODOs