Moved utils into separate file
Re-organised module