More work on Scala, cleaning the Scala directory