entity refactoring for techtree complete