Refactored RPC package classes for better usability