[class-utils] clean up
[utils] reorganize