Rearranged log classes o separate package.