Refactor of Rapid Reseller