Added RF API and moved one file