Fixes for maven configuration so that it will generate from command line correctly
Moved classes into more appropriate classes
Desktop is now included by default in aggregate build
Fixed scala 2.10 incompatibility caused by extended a case class with a case class