Change package structure and revert public visibility
Add final modifier
Class util is not needed anymore
Remove useless builder
Remove unnecessary semicolon