Really just beating my head against build errors

A lot of what's here was trying to break things into smaller pieces so I
could cope with compiler errors and try to split the ball of mud into at
least slightly more manageable pieces.

Wound up spending almost all evening fighting with java imports.