java/src refactoring