package paths refactored, yandex-specifics removed, bug fixes