add scalatest dependency
move the source files so they are less deep in the folder structure