package paths refactored, yandex-specifics removed, bug fixes

I could it using dict.update, but merge would work only for top level