Added missing file. Also rationalised function names across container / folder / file.