Move types around