More changes required, finding more places where do or require is used.
Some of the modules requires extra files -- graphics, templates, and so on.
