New configuration.

Much closer to an actual "module".