moved to scala folders to be picked up by sbt
builds in sbt, simplified the pruning