change organization to riscv