Grunt entity/enemy + rearranging some things