Refactored for src/main/java