added scala sources (for the scala-version branch), removed the java ones