moved code to src/main/java