Types moved to separate files.