[Graeme] Changed to sbt compatible structure