Updates to file structure for delegates.