Moved to src/main/java, as Scala was barfing and I don't actually use
Scala anymore