Refactored EntityLinker Interface
Finished Refactoring, Code compiles