Code refactoring associated with xr_input

Слиты xottab-duty запросил слияние github/fork/justtails/pr2_refactor в xd_dev

Created by: justtails

You need to accept it second.