Refactoring to prepare for disambiguation
Added disambiguations tests

disambiguation pages still missing