changed package to a more sbt way to organize packages