No functional changes, just moving code around. Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>