Cleanup and add more configs
Move utils into util directory