moved entityName*.go to util/, which corrects an obscure bug in overlay/