Load on demand

My experiments with the old format didn't work because packages get loaded first.