Move to src/main/java