update to scala 2.10.4; move scala file to src directory