Fix utils
Split into modules for easier dev
Fix readme