Removed TODO comment and added explanation
Some reordering of files