Move common types into a separate module.