Adding patch test job + file reorg: