Moved scala files to scala directory (yeah I know, or actually, I don't know how they got there)