update utils
refactor maven project structure