Add utils to autoload paths
Refactor module structure
Remove Util references