All classes changed to run as packages via the main program.