RF clean up, organize code into packages and objects