Moving code around.  Note that some things have moveed to Jartender.
Improved tests
Changes for all-scala plugin 42