Removed completed todos
Moved utils into util directory