Moving references into separate files.