Restructure, and add support for ScalaTest