- move util classes to own project where possible