Make it more Scala
Moved all but Main activity into the View package.