EST-265: removed Geography entity, pushed down....

... into Country, State