move code from src/ to src/java