moved utils back to src/main/java