moved scala stuff into scala dir