Updated single-file versions of modella.