Moving Term to src/main/java