Fix Entity & move Util to Entity