update to new Scala version, rearranging file name