Reorganize for future patches, no functional change.
Acked-by: NAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: NEdgar E. Iglesias <edgar.iglesias@gmail.com>