reorganize and use Build.scala