Massive refactor - Added Entity types and update EntityEditor