Restructured around a package.scala