minor changes in Master and Worker and introduce package.scala