Abstracted FilePackage's and Client's into their own Classes