move package object to file package.scala

also: moved util.scala into package.scala