rf: added missing files to refactor