Temporarily cope with funny business.
Scaled package and module files.

Need to sort out how we'll depend on tools.jar. Oh tools.jar, you're always
such a PITA.