#RF structure refactoring