Move syl20bnr contrib to usr sub-directory