Upgraded Scala version. Added missing source directories