Moved some parts to the corresponding file in utf8.