Moving to scala build