Reorganize some imports