Reorganization and move RNF outside of the project