Martin.J

Packages renamed
Added Maven code to Build.scala