added to {src,tests}/{java/scala}