Re-arrange utilities into util folder