Build.scala and hw.scala modification