Move types to seperate files.